[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage Website.pm,1.25,1.26

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

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

Modified Files:
	Website.pm 
Log Message:
be able to install package given a brick_class or brick_name, assuming it contains a single resource with the base64'd zip file


Index: Website.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Website.pm	17 Mar 2005 14:58:02 -0000	1.25
--- Website.pm	24 Mar 2005 05:32:35 -0000	1.26
***************
*** 93,103 ****
      my ( $self, $website_dir, $package_names ) = @_;
      foreach my $pkg_name ( @{ $package_names } ) {
!         my $brick = OpenInteract2::Brick->new( $pkg_name );
!         foreach my $resource_name ( $brick->list_resources ) {
!             my $pkg_info = $brick->load_resource( $resource_name );
!             my $pkg_file = OpenInteract2::Util->decode_base64_and_store(
!                 \$pkg_info->{content}
!             );
!             $self->_install_package_file( undef, $pkg_file, $website_dir );
          }
      }
--- 93,110 ----
      my ( $self, $website_dir, $package_names ) = @_;
      foreach my $pkg_name ( @{ $package_names } ) {
!         my $install_task = OpenInteract2::Manage->new(
!             'install_package', {
!                 brick_name   => $pkg_name,
!                 website_dir  => $website_dir,
!             });
! 
!         $self->copy_observers( $install_task );
!         eval { $install_task->execute };
!         if ( $@ ) {
!             $self->_fail( 'install package',
!                           "Failed to install $pkg_name: $@" );
!         }
!         else {
!             $self->_add_status( $install_task->get_status );
          }
      }