/[packages]/cauldron/libreoffice/pristine/SOURCES/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
ViewVC logotype

Diff of /cauldron/libreoffice/pristine/SOURCES/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 89027 by dmorgan, Wed Apr 20 09:14:18 2011 UTC revision 89865 by dmorgan, Sat Apr 23 00:42:43 2011 UTC
# Line 5  retrieving revision 1.17 Line 5  retrieving revision 1.17
5  diff -u -p -r1.17 scriptitems.pm  diff -u -p -r1.17 scriptitems.pm
6  --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm     24 Feb 2005 16:21:15 -0000      1.17  --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm     24 Feb 2005 16:21:15 -0000      1.17
7  +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm  18 Mar 2005 22:39:42 -0000  +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm  18 Mar 2005 22:39:42 -0000
8  @@ -1066,7 +1066,7 @@  @@ -1065,7 +1065,7 @@
9               }               }
10               else               else
11               {               {
# Line 14  diff -u -p -r1.17 scriptitems.pm Line 14  diff -u -p -r1.17 scriptitems.pm
14               }               }
15    
16               push( @installer::globals::logfileinfo, $infoline);               push( @installer::globals::logfileinfo, $infoline);
17  @@ -1144,7 +1144,7 @@  @@ -1143,7 +1143,7 @@
18               }               }
19               else               else
20               {               {
# Line 23  diff -u -p -r1.17 scriptitems.pm Line 23  diff -u -p -r1.17 scriptitems.pm
23               }               }
24    
25               push( @installer::globals::logfileinfo, $infoline);               push( @installer::globals::logfileinfo, $infoline);
26  @@ -1356,11 +1356,10 @@  @@ -1360,11 +1360,10 @@
27    
28               if ( ! $installer::globals::languagepack && !$installer::globals::helppack)                   if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
              {  
 -                $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_occurred = 1;  
 +                push(@missingfiles, "WARNING: File not found: $filename\n");    
   
                  next;  # removing this file from list, if sourcepath is empty  
              }  
 @@ -1368,11 +1367,10 @@  
              {  
                  if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))  
29                   {                   {
30  -                    $infoline = "ERROR: Removing file $filename from file list.\n";  -                    $infoline = "ERROR: Removing file $filename from file list.\n";
31  +                    $infoline = "WARNING: Removing file $filename from file list.\n";  +                    $infoline = "WARNING: Removing file $filename from file list.\n";
32                       push( @installer::globals::logfileinfo, $infoline);                       push( @installer::globals::logfileinfo, $infoline);
33    
34  -                    push(@missingfiles, "ERROR: File not found: $filename\n");  -                    push(@missingfiles, "ERROR: File not found: $filename\n");
35  -                    $error_occurred = 1;  -                    $error_occured = 1;
36  +                    push(@missingfiles, "WARNING: File not found: $filename\n");        +                    push(@missingfiles, "WARNING: File not found: $filename\n");      
37    
38                       next;      # removing this file from list, if sourcepath is empty                                 next;      # removing this file from list, if sourcepath is empty
39                   }                   }
40  @@ -1390,11 +1388,10 @@  @@ -1372,11 +1371,10 @@
              {  
                  if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))  
41                   {                   {
42  -                    $infoline = "ERROR: Removing file $filename from file list.\n";                       if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
43  +                    $infoline = "WARNING: Removing file $filename from file list.\n";                       {
44                       push( @installer::globals::logfileinfo, $infoline);  -                        $infoline = "ERROR: Removing file $filename from file list.\n";
45    +                                               $infoline = "WARNING: Removing file $filename from file list.\n";
46                             push( @installer::globals::logfileinfo, $infoline);
47    
48    -                        push(@missingfiles, "ERROR: File not found: $filename\n");    
49    -                        $error_occured = 1;
50    +                                               push(@missingfiles, "WARNING: File not found: $filename\n");    
51    
52  -                    push(@missingfiles, "ERROR: File not found: $filename\n");                           next;  # removing this file from list, if sourcepath is empty          
53  -                    $error_occured = 1;                       }
 +                    push(@missingfiles, "WARNING: File not found: $filename\n");        
   
                      next;      # removing this file from list, if sourcepath is empty            
                  }  
54  --- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm   2010-07-12 10:27:26.000000000 +0100  --- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm   2010-07-12 10:27:26.000000000 +0100
55  +++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm        2010-07-12 10:27:54.000000000 +0100  +++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm        2010-07-12 10:27:54.000000000 +0100
56  @@ -53,7 +53,7 @@  @@ -53,7 +53,7 @@
# Line 76  diff -u -p -r1.17 scriptitems.pm Line 62  diff -u -p -r1.17 scriptitems.pm
62          }          }
63          elsif( $installer::globals::packageformat eq "dmg" )          elsif( $installer::globals::packageformat eq "dmg" )
64          {          {
65    
Legend:
Removed from v.89027  
changed lines
  Added in v.89865
  ViewVC Help
Powered by ViewVC 1.1.30