[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Package.pm,1.42,1.43

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

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

Modified Files:
	Package.pm 
Log Message:
OIN-102:  ensure we do not get multiple errors when a module declared in the package.conf cannot be brought in

Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Package.pm	25 Jan 2005 02:47:20 -0000	1.42
--- Package.pm	25 Jan 2005 03:09:16 -0000	1.43
***************
*** 463,473 ****
  
      push @status, $self->_check_manifest;
!     push @status, $self->_check_package_config;
  
      my @ini_files = grep /^conf.*\.ini$/, @{ $pkg_files };
      push @status, $self->_check_ini_files( \@ini_files );
  
!     my @pm_files = grep /\.pm$/, @{ $pkg_files };
!     push @status, $self->_check_pm_files( \@pm_files );
  
      my @data_files = grep /^data\/.*\.dat$/, @{ $pkg_files };
--- 463,483 ----
  
      push @status, $self->_check_manifest;
!     my ( $c_required, $c_modules ) = $self->_check_package_config;
!     push @status, $c_required, $c_modules;
  
      my @ini_files = grep /^conf.*\.ini$/, @{ $pkg_files };
      push @status, $self->_check_ini_files( \@ini_files );
  
!     if ( $c_modules->{is_ok} eq 'no' ) {
!         push @status, {
!             action  => 'Check package modules',
!             is_ok   => 'no',
!             message => 'Skipped module checks since dependencies failed',
!         };
!     }
!     else {
!         my @pm_files = grep /\.pm$/, @{ $pkg_files };
!         push @status, $self->_check_pm_files( \@pm_files );
!     }
  
      my @data_files = grep /^data\/.*\.dat$/, @{ $pkg_files };