openinteract-commits

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

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

Modified Files:
	InstallPackageSql.pm 
Log Message:
change the name of the setup step we skip to match new name; also change how we run the SPOPS activation task to match the new setup functionality


Index: InstallPackageSql.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/InstallPackageSql.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InstallPackageSql.pm	13 Jun 2004 18:19:54 -0000	1.11
--- InstallPackageSql.pm	24 Jan 2005 17:02:38 -0000	1.12
***************
*** 30,34 ****
  sub setup_task {
      my ( $self ) = @_;
!     $self->_setup_context( { skip => 'activate spops' } );
  }
  
--- 30,34 ----
  sub setup_task {
      my ( $self ) = @_;
!     $self->_setup_context( { skip => 'initialize spops' } );
  }
  
***************
*** 45,55 ****
          $self->_add_status( $struct->get_status );
  
!         # Re-reads the SPOPS config now that the tables are created...
! 
!         my $setup = OpenInteract2::Setup->new;
!         $setup->activate_spops_classes( CTX->spops_config );
  
          $data->execute;
          $self->_add_status( $data->get_status );
          $security->execute;
          $self->_add_status( $security->get_status );
--- 45,54 ----
          $self->_add_status( $struct->get_status );
  
!         # Initializes the SPOPS objects now that the tables are created...
!         OpenInteract2::Setup->run_setup_for( 'initialize spops' );
  
          $data->execute;
          $self->_add_status( $data->get_status );
+ 
          $security->execute;
          $self->_add_status( $security->get_status );