fix to apply again

f41
Caolán McNamara 14 years ago
parent 63990ecff3
commit ea0c66ee0e

@ -5,7 +5,7 @@ retrieving revision 1.17
diff -u -p -r1.17 scriptitems.pm 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.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 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
@@ -1077,7 +1077,7 @@ @@ -1065,7 +1065,7 @@
} }
else else
{ {
@ -14,7 +14,7 @@ diff -u -p -r1.17 scriptitems.pm
} }
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
@@ -1155,7 +1155,7 @@ @@ -1143,7 +1143,7 @@
} }
else else
{ {
@ -23,9 +23,9 @@ diff -u -p -r1.17 scriptitems.pm
} }
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
@@ -1371,11 +1371,10 @@ @@ -1360,11 +1360,10 @@
if ( ! $installer::globals::languagepack ) if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
{ {
- $infoline = "ERROR: Removing file $filename from file list.\n"; - $infoline = "ERROR: Removing file $filename from file list.\n";
+ $infoline = "WARNING: Removing file $filename from file list.\n"; + $infoline = "WARNING: Removing file $filename from file list.\n";
@ -37,7 +37,7 @@ diff -u -p -r1.17 scriptitems.pm
next; # removing this file from list, if sourcepath is empty next; # removing this file from list, if sourcepath is empty
} }
@@ -1383,11 +1382,10 @@ @@ -1372,11 +1371,10 @@
{ {
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{ {

Loading…
Cancel
Save