[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Petr Mladek]

 patches/dev300/piece-solenv.diff |   36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 0c237a3aa2ffc68cdb9f11be907414de722ebcb7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sat Dec 18 15:12:46 2010 +0100

    fix patches/dev300/piece-solenv.diff to apply

diff --git a/patches/dev300/piece-solenv.diff b/patches/dev300/piece-solenv.diff
index 24395f7..b655b4f 100644
--- a/patches/dev300/piece-solenv.diff
+++ b/patches/dev300/piece-solenv.diff
@@ -39,29 +39,29 @@
      # ToDo: Needs to be expanded for additional platforms
  
  }
---- solenv/bin/modules/installer/scriptitems.pm.old	2010-03-05 19:59:19.000000000 +0100
-+++ solenv/bin/modules/installer/scriptitems.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -1373,8 +1373,10 @@ sub remove_Files_Without_Sourcedirectory
+--- solenv/bin/modules/installer/scriptitems.pm.old	2010-12-18 15:04:22.000000000 +0100
++++ solenv/bin/modules/installer/scriptitems.pm	2010-12-18 15:10:09.000000000 +0100
+@@ -1358,8 +1358,9 @@ sub remove_Files_Without_Sourcedirectory
              
              if ( ! ( $styles =~ /\bSTARREGISTRY\b/ ))	# StarRegistry files will be created later
              {
 -                my $filename = $onefile->{'Name'};
+-
 +              my $filename = $onefile->{'Name'};
- 
-+              if (! $installer::globals::split)
++              if (! $installer::globals::split) 
 +              {
-                 if ( ! $installer::globals::languagepack )
+                 if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
                  {
                      $infoline = "ERROR: Removing file $filename from file list.\n";
-@@ -1383,7 +1385,6 @@ sub remove_Files_Without_Sourcedirectory
+@@ -1368,7 +1369,6 @@ sub remove_Files_Without_Sourcedirectory
                      push(@missingfiles, "ERROR: File not found: $filename\n");	
                      $error_occured = 1;
  
 -                    next;	# removing this file from list, if sourcepath is empty
                  }
-                 else # special case for language packs
+                 elsif ( $installer::globals::languagepack ) # special case for language packs
                  {
-@@ -1395,7 +1396,6 @@ sub remove_Files_Without_Sourcedirectory
+@@ -1380,7 +1380,6 @@ sub remove_Files_Without_Sourcedirectory
                          push(@missingfiles, "ERROR: File not found: $filename\n");	
                          $error_occured = 1;
  
@@ -69,13 +69,29 @@
                      }
                      else
                      {
-@@ -1404,9 +1404,10 @@ sub remove_Files_Without_Sourcedirectory
+@@ -1389,7 +1388,6 @@ sub remove_Files_Without_Sourcedirectory
                          $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
                          push( @installer::globals::logfileinfo, $infoline);
  
 -                        next;	# removing this file from list, if sourcepath is empty					
                      }
                  }
+                 else # special case for help packs
+@@ -1402,7 +1400,6 @@ sub remove_Files_Without_Sourcedirectory
+                         push(@missingfiles, "ERROR: File not found: $filename\n");	
+                         $error_occured = 1;
+ 
+-                        next;	# removing this file from list, if sourcepath is empty		
+                     }
+                     else
+                     {
+@@ -1411,9 +1408,10 @@ sub remove_Files_Without_Sourcedirectory
+                         $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
+                         push( @installer::globals::logfileinfo, $infoline);
+ 
+-                        next;	# removing this file from list, if sourcepath is empty					
+                     }
+                 }
 +              }
 +              next;	# removing this file from list, if sourcepath is empty
              }