[openoffice.org/f12/master] defuzz

[Caolan McNamara]

commit cd2692b0b21265ebb2e891c4cefda67428811ba8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 13 12:06:24 2010 +0100

    defuzz

 ...ce.org-3.1.0.oooXXXXX.solenv.allowmissing.patch |   63 +++-----------------
 1 files changed, 8 insertions(+), 55 deletions(-)
---
diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
index 1676e40..8528f47 100644
--- a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+++ b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
@@ -5,60 +5,13 @@ retrieving revision 1.17
 diff -u -p -r1.17 scriptitems.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm	24 Feb 2005 16:21:15 -0000	1.17
 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm	18 Mar 2005 22:39:42 -0000
-@@ -1077,7 +1077,7 @@
- 			}
- 			else
- 			{
--				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
-+				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
- 			}
- 
- 			push( @installer::globals::logfileinfo, $infoline);
-@@ -1155,7 +1155,7 @@
- 			}
- 			else
- 			{
--				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
-+				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
- 			}
+@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
+ 				$infoline = "ERROR: Removing file $filename from file list.\n";
+ 				push( @installer::globals::logfileinfo, $infoline);
  
- 			push( @installer::globals::logfileinfo, $infoline);
-@@ -1371,11 +1371,10 @@
+-				push(@missingfiles, "ERROR: File not found: $filename\n");	
+-				$error_occured = 1;
++				push(@missingfiles, "Warning: File not found: $filename\n");	
  
- 				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");	
- 
- 					next;	# removing this file from list, if sourcepath is empty
- 				}
-@@ -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");	
- 
- 						next;	# removing this file from list, if sourcepath is empty		
- 					}
---- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:26.000000000 +0100
-+++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:54.000000000 +0100
-@@ -53,7 +53,7 @@
- 		( $installer::globals::packageformat eq "archive" ))
- 	{
- 		$installer::globals::is_simple_packager_project = 1;
--		$installer::globals::patch_user_dir = 1;
-+		$installer::globals::patch_user_dir = 0;
- 	}
- 	elsif( $installer::globals::packageformat eq "dmg" )
- 	{
+ 				next;	# removing this file from list, if sourcepath is empty
+ 			}