[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Package.pm,1.44,1.45

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

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

Modified Files:
	Package.pm 
Log Message:
we cannot depend on the package ZIP containing the name + version


Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Package.pm	25 Jan 2005 04:03:19 -0000	1.44
--- Package.pm	2 Feb 2005 13:14:35 -0000	1.45
***************
*** 72,76 ****
              oi_error "Cannot initialize package with non-existent package ",
                       "directory. (Given $params->{directory})";
!         }        
          $log->is_debug &&
              $log->debug( "Reading package from directory '$full_directory'" );
--- 72,76 ----
              oi_error "Cannot initialize package with non-existent package ",
                       "directory. (Given $params->{directory})";
!         }
          $log->is_debug &&
              $log->debug( "Reading package from directory '$full_directory'" );
***************
*** 106,110 ****
      $log ||= get_logger( LOG_OI );
  
!     my $tmp_dir = tempdir( 'OIPKGXXXX', TMPDIR => 1, CLEANUP => 1 );
      unless ( -d $tmp_dir and -w $tmp_dir ) {
          oi_error "Cannot find writeable temp dir";
--- 106,110 ----
      $log ||= get_logger( LOG_OI );
  
!     my $tmp_dir = tempdir( 'OIPKGXXXXXX', TMPDIR => 1, CLEANUP => 1 );
      unless ( -d $tmp_dir and -w $tmp_dir ) {
          oi_error "Cannot find writeable temp dir";
***************
*** 117,125 ****
          $log->debug( "Reading package info from '$package_file'" );
      eval {
!         my $filename = basename( $self->package_file );
!         my $ext = '.' . DISTRIBUTION_EXTENSION;
!         my ( $subdir ) = $filename =~ /^(.*)$ext$/;
!         $self->_extract_archive( $self->package_file );
!         my $extracted_dir = catdir( $tmp_dir, $subdir );
          $self->_read_info_from_dir( $extracted_dir );
          $self->_read_manifest( $extracted_dir );
--- 117,129 ----
          $log->debug( "Reading package info from '$package_file'" );
      eval {
!         my $extracted = $self->_extract_archive( $self->package_file );
!         unless ( scalar @{ $extracted } ) {
!             oi_error "Failed to extract any files from package ",
!                      "file ", $self->package_file;
!         }
!         my @sample_path = split( '/', $extracted->[0]->fileName() );
!         my $extracted_dir = catdir( $tmp_dir, $sample_path[0] );
!         $log->is_debug &&
!             $log->debug( "Package unpacked to directory '$extracted_dir'" );
          $self->_read_info_from_dir( $extracted_dir );
          $self->_read_manifest( $extracted_dir );
***************
*** 156,160 ****
  }
  
- 
  ########################################
  # PROPERTIES
--- 160,163 ----