[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Package Export.pm,1.12,1.13

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

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

Modified Files:
	Export.pm 
Log Message:
OIN-111: ensure every package exported through management task is associated with a status message, even if it fails

Index: Export.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package/Export.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Export.pm	13 Jun 2004 18:19:54 -0000	1.12
--- Export.pm	25 Jan 2005 02:47:24 -0000	1.13
***************
*** 74,87 ****
      my ( $self, $package_dir ) = @_;
      my $package = OpenInteract2::Package->new({
!                         directory => $package_dir });
!     my $filename = $package->export;
      my %status = (
!             is_ok    => 'yes',
              action   => sprintf( 'Export package %s', $package->name ),
              filename => $filename,
              package  => $package->name,
              version  => $package->version,
!             message  => sprintf( 'Exported package %s-%s to %s',
!                                 $package->name, $package->version, $filename )
      );
      $self->_add_status( \%status );
--- 74,98 ----
      my ( $self, $package_dir ) = @_;
      my $package = OpenInteract2::Package->new({
!         directory => $package_dir
!     });
!     my $is_ok = 'yes';
!     my ( $msg );
!     my $filename = eval { $package->export };
!     if ( $@ ) {
!         $is_ok = 'no';
!         $msg   = sprintf( 'Failed to export %s-%s: %s', 
!                           $package->name, $package->version, "$@" );
!     }
!     else {
!         $filename = sprintf( 'Exported package %s-%s to %s',
!                              $package->name, $package->version, $filename );
!     }
      my %status = (
!             is_ok    => $is_ok,
              action   => sprintf( 'Export package %s', $package->name ),
              filename => $filename,
              package  => $package->name,
              version  => $package->version,
!             message  => $msg,
      );
      $self->_add_status( \%status );