[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Config GlobalOverride.pm,1.8,1.9 Ini.pm,1.15,1.16

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

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

Modified Files:
	GlobalOverride.pm Ini.pm 
Log Message:
OIN-81: remove warnings

Index: GlobalOverride.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/GlobalOverride.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GlobalOverride.pm	27 Sep 2004 09:22:56 -0000	1.8
--- GlobalOverride.pm	27 Sep 2004 13:24:55 -0000	1.9
***************
*** 234,239 ****
      }
  
!     $log->info( "Adding to '$key' with type '$type'; ",
!                 "existing value is '$item->{ $key }'" );
      my $sv = join( ', ', @{ $rule->{value} } );
      if ( $type eq 'list' ) {
--- 234,242 ----
      }
  
!     $log->is_info &&
!         $log->info( "Adding to '$key' with type '$type'; ",
!                     "existing value is ", 
!                     ( defined $item->{ $key } 
!                       ? "'$item->{ $key }'" : 'not defined' ) );
      my $sv = join( ', ', @{ $rule->{value} } );
      if ( $type eq 'list' ) {

Index: Ini.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/Ini.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Ini.pm	13 Jun 2004 16:15:42 -0000	1.15
--- Ini.pm	27 Sep 2004 13:24:55 -0000	1.16
***************
*** 310,313 ****
--- 310,314 ----
          $filename = "$filename.new";
      }
+     $original_filename ||= '';
  
      # Set 'Global' items from the config object root