[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage Package.pm,1.15,1.16

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

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

Modified Files:
	Package.pm 
Log Message:
OIN-137: move from package.conf to package.ini


Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Package.pm	8 Feb 2005 01:28:34 -0000	1.15
--- Package.pm	28 Feb 2005 00:59:18 -0000	1.16
***************
*** 5,8 ****
--- 5,9 ----
  use strict;
  use base qw( OpenInteract2::Manage );
+ use File::Spec::Functions    qw( catfile );
  use OpenInteract2::Exception qw( oi_error );
  
***************
*** 56,66 ****
      eval { opendir( PKGDIR, $package_dir ) || die $! };
      if ( $@ ) {
!         return "Cannot open directory [$package_dir]: $@";
      }
      my %pkg_files = map { $_ => 1 }
!                     grep { -f File::Spec->catfile( $package_dir, $_ ) }
                      readdir( PKGDIR );
!     unless ( $pkg_files{'package.conf'} ) {
!         return "Directory [$package_dir] does not contain a package";
      }
      return;
--- 57,67 ----
      eval { opendir( PKGDIR, $package_dir ) || die $! };
      if ( $@ ) {
!         return "Cannot open directory '$package_dir': $@";
      }
      my %pkg_files = map { $_ => 1 }
!                     grep { -f catfile( $package_dir, $_ ) }
                      readdir( PKGDIR );
!     unless ( $pkg_files{'package.ini'} ) {
!         return "Directory '$package_dir' does not contain a package";
      }
      return;