Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28868
Modified Files:
PackageCheckExportInstall.pm
Log Message:
OIN-147: don't create the context too early, otherwise the package checks give weird results
Index: PackageCheckExportInstall.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/PackageCheckExportInstall.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PackageCheckExportInstall.pm 28 Feb 2005 02:34:04 -0000 1.5
--- PackageCheckExportInstall.pm 11 Mar 2005 05:14:31 -0000 1.6
***************
*** 46,49 ****
--- 46,54 ----
}
+ # no-op, but don't remove otherwise the 'check_package' task will
+ # check the wrong files!
+ # -- see OIN-147 for sample error
+ sub setup_task {}
+
sub run_task {
my ( $self ) = @_;
***************
*** 68,71 ****
--- 73,77 ----
warn "Package file set to '$package_file'\n";
+
( $is_ok, $subtask ) = $self->_run_subtask(
'install_package', package_file => $package_file );
***************
*** 77,85 ****
sub _run_subtask {
my ( $self, $task_name, %extra_params ) = @_;
! my $subtask = OpenInteract2::Manage->new(
! $task_name, { package_dir => $self->param( 'package_dir' ),
! website_dir => $self->param( 'website_dir' ),
! %extra_params }
! );
eval { $subtask->execute() };
if ( $@ ) {
--- 83,91 ----
sub _run_subtask {
my ( $self, $task_name, %extra_params ) = @_;
! my $subtask = OpenInteract2::Manage->new( $task_name, {
! package_dir => $self->param( 'package_dir' ),
! website_dir => $self->param( 'website_dir' ),
! %extra_params
! });
eval { $subtask->execute() };
if ( $@ ) {
|
