[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Package.pm,1.54,1.55

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

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

Modified Files:
	Package.pm 
Log Message:
add more info to what files we're checking (better error)


Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Package.pm	13 Mar 2005 18:36:24 -0000	1.54
--- Package.pm	17 Mar 2005 06:05:03 -0000	1.55
***************
*** 258,262 ****
          @spops_files = map { catfile( $dir, $_ ) } @{ $base_files };
      }
!     $self->_check_file_validity( \@spops_files );
      return \@spops_files
  }
--- 258,262 ----
          @spops_files = map { catfile( $dir, $_ ) } @{ $base_files };
      }
!     $self->_check_file_validity( 'SPOPS configuration', \@spops_files );
      return \@spops_files
  }
***************
*** 282,286 ****
          @action_files = map { catfile( $dir, $_ ) } @{ $base_files };
      }
!     $self->_check_file_validity( \@action_files );
      return \@action_files;
  }
--- 282,286 ----
          @action_files = map { catfile( $dir, $_ ) } @{ $base_files };
      }
!     $self->_check_file_validity( 'action configuration', \@action_files );
      return \@action_files;
  }
***************
*** 297,309 ****
      my $dir = $self->directory;
      my @full_message_files = map { catfile( $dir, $_ ) } @{ $base_files };
!     $self->_check_file_validity( \@full_message_files );
      return \@full_message_files;
  }
  
  sub _check_file_validity {
!     my ( $self, $files ) = @_;
      foreach my $file ( @{ $files } ) {
          unless ( -f $file ) {
!             oi_error "Package file returned '$file' is invalid.";
          }
      }
--- 297,309 ----
      my $dir = $self->directory;
      my @full_message_files = map { catfile( $dir, $_ ) } @{ $base_files };
!     $self->_check_file_validity( 'localization file', \@full_message_files );
      return \@full_message_files;
  }
  
  sub _check_file_validity {
!     my ( $self, $type, $files ) = @_;
      foreach my $file ( @{ $files } ) {
          unless ( -f $file ) {
!             oi_error "Package $type returned '$file', an invalid file.";
          }
      }