[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website InstallPackage.pm,1.17,1.18

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15527/Manage/Website

Modified Files:
	InstallPackage.pm 
Log Message:
OIN-72: put off initializing the context until after we've instantiated our app class; otherwise we might instantiate the old one


Index: InstallPackage.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/InstallPackage.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** InstallPackage.pm	9 Mar 2005 20:26:24 -0000	1.17
--- InstallPackage.pm	13 Mar 2005 18:38:22 -0000	1.18
***************
*** 56,63 ****
  }
  
! sub setup_task {
!     my ( $self ) = @_;
!     $self->_setup_context( { skip => 'initialize temp lib' } );
! }
  
  
--- 56,60 ----
  }
  
! sub setup_task {}
  
  
***************
*** 67,71 ****
      my ( $self ) = @_;
      my %status = (
!         action   => 'install package',
      );
      if ( my $package_file = $self->param( 'package_file' ) ) {
--- 64,68 ----
      my ( $self ) = @_;
      my %status = (
!         action => 'install package',
      );
      if ( my $package_file = $self->param( 'package_file' ) ) {
***************
*** 85,88 ****
--- 82,88 ----
          package_file => $package_file
      });
+ 
+     $self->_setup_context();
+ 
      my $is_installed = $self->_check_package_exists(
          $package->name, $package->version, $status );
***************
*** 133,136 ****
--- 133,140 ----
      my $name    = $app->name;
      my $version = $app->version;
+ 
+     # put this off so we don't load older versions...
+     $self->_setup_context();
+ 
      my $is_installed = $self->_check_package_exists(
          $name, $version, $status );