rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22427

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 
Log Message:
tweak allow missing

openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch:
 scriptitems.pm |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	8 May 2010 07:48:16 -0000	1.3
+++ openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	8 May 2010 12:51:04 -0000	1.4
@@ -23,23 +23,31 @@ diff -u -p -r1.17 scriptitems.pm
  			}
  
  			push( @installer::globals::logfileinfo, $infoline);
-@@ -1374,8 +1374,7 @@
- 					$infoline = "ERROR: Removing file $filename from file list.\n";
+@@ -1371,11 +1371,10 @@
+ 
+ 				if ( ! $installer::globals::languagepack )
+ 				{
+-					$infoline = "ERROR: Removing file $filename from file list.\n";
++					$infoline = "WARNING: Removing file $filename from file list.\n";
  					push( @installer::globals::logfileinfo, $infoline);
  
 -					push(@missingfiles, "ERROR: File not found: $filename\n");	
 -					$error_occured = 1;
-+					push(@missingfiles, "Warning: File not found: $filename\n");	
++					push(@missingfiles, "WARNING: File not found: $filename\n");	
  
  					next;	# removing this file from list, if sourcepath is empty
  				}
-@@ -1386,8 +1385,7 @@
- 						$infoline = "ERROR: Removing file $filename from file list.\n";
+@@ -1383,11 +1382,10 @@
+ 				{
+ 					if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
+ 					{
+-						$infoline = "ERROR: Removing file $filename from file list.\n";
++						$infoline = "WARNING: Removing file $filename from file list.\n";
  						push( @installer::globals::logfileinfo, $infoline);
  
 -						push(@missingfiles, "ERROR: File not found: $filename\n");	
 -						$error_occured = 1;
-+						push(@missingfiles, "Warning: File not found: $filename\n");	
++						push(@missingfiles, "WARNING: File not found: $filename\n");	
  
  						next;	# removing this file from list, if sourcepath is empty		
  					}