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

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

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

Modified Files:
	InstallPackage.pm 
Log Message:
add the package installed as a parameter to the task; cosmetic fixes


Index: InstallPackage.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/InstallPackage.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InstallPackage.pm	25 Sep 2004 18:15:37 -0000	1.14
--- InstallPackage.pm	2 Feb 2005 13:07:12 -0000	1.15
***************
*** 5,8 ****
--- 5,9 ----
  use strict;
  use base qw( OpenInteract2::Manage::Website );
+ use File::Spec::Functions  qw( catfile );
  use OpenInteract2::Context qw( CTX );
  use OpenInteract2::Repository;
***************
*** 47,52 ****
          filename => $package_file,
      );
!     my $package = OpenInteract2::Package->new(
!                       { package_file => $package_file });
      my $repository = CTX->repository;
      my $rep_package = $repository->fetch_package( $package->name );
--- 48,54 ----
          filename => $package_file,
      );
!     my $package = OpenInteract2::Package->new({
!         package_file => $package_file
!     });
      my $repository = CTX->repository;
      my $rep_package = $repository->fetch_package( $package->name );
***************
*** 64,68 ****
              OpenInteract2::Package->install({
                      package_file => $package_file,
!                     repository   => CTX->repository })
          };
          if ( $@ ) {
--- 66,71 ----
              OpenInteract2::Package->install({
                      package_file => $package_file,
!                     repository   => CTX->repository
!             })
          };
          if ( $@ ) {
***************
*** 86,89 ****
--- 89,93 ----
              }
          }
+         $self->param( package => $installed_package );
      }
      $self->notify_observers(
***************
*** 101,110 ****
      my $temp_lib_dir = CTX->lookup_temp_lib_directory;
      return unless ( -d $temp_lib_dir );      # nothing to refresh!
!     my $refresh_file =
!         File::Spec->catfile( $temp_lib_dir,
!                              CTX->lookup_temp_lib_refresh_filename );
      return if ( -f $refresh_file );          # someone already refreshed!
      open( REFRESH, '>', $refresh_file )
!                     || die "Cannot open refresh file: $!";
      print REFRESH "Forced refresh from package '$package_name' ",
                    "installed on ", scalar( localtime );
--- 105,114 ----
      my $temp_lib_dir = CTX->lookup_temp_lib_directory;
      return unless ( -d $temp_lib_dir );      # nothing to refresh!
!     my $refresh_file = catfile(
!         $temp_lib_dir, CTX->lookup_temp_lib_refresh_filename
!     );
      return if ( -f $refresh_file );          # someone already refreshed!
      open( REFRESH, '>', $refresh_file )
!         || die "Cannot open refresh file: $!";
      print REFRESH "Forced refresh from package '$package_name' ",
                    "installed on ", scalar( localtime );