| 1 |
dmorgan |
68279 |
Index: bin/modules/installer/scriptitems.pm |
| 2 |
|
|
=================================================================== |
| 3 |
|
|
RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v |
| 4 |
|
|
retrieving revision 1.17 |
| 5 |
|
|
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 |
| 7 |
|
|
+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000 |
| 8 |
|
|
@@ -1065,7 +1065,7 @@ |
| 9 |
dmorgan |
42455 |
} |
| 10 |
|
|
else |
| 11 |
|
|
{ |
| 12 |
dmorgan |
68279 |
- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file |
| 13 |
|
|
+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file |
| 14 |
|
|
} |
| 15 |
|
|
|
| 16 |
|
|
push( @installer::globals::logfileinfo, $infoline); |
| 17 |
|
|
@@ -1143,7 +1143,7 @@ |
| 18 |
|
|
} |
| 19 |
|
|
else |
| 20 |
|
|
{ |
| 21 |
|
|
- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file |
| 22 |
|
|
+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file |
| 23 |
|
|
} |
| 24 |
|
|
|
| 25 |
|
|
push( @installer::globals::logfileinfo, $infoline); |
| 26 |
dmorgan |
42455 |
@@ -1360,11 +1360,10 @@ |
| 27 |
|
|
|
| 28 |
|
|
if ( ! $installer::globals::languagepack && !$installer::globals::helppack) |
| 29 |
|
|
{ |
| 30 |
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n"; |
| 31 |
dmorgan |
68279 |
+ $infoline = "WARNING: Removing file $filename from file list.\n"; |
| 32 |
dmorgan |
42455 |
push( @installer::globals::logfileinfo, $infoline); |
| 33 |
|
|
|
| 34 |
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n"); |
| 35 |
|
|
- $error_occured = 1; |
| 36 |
dmorgan |
68279 |
+ push(@missingfiles, "WARNING: File not found: $filename\n"); |
| 37 |
dmorgan |
42455 |
|
| 38 |
|
|
next; # removing this file from list, if sourcepath is empty |
| 39 |
|
|
} |
| 40 |
|
|
@@ -1372,11 +1371,10 @@ |
| 41 |
|
|
{ |
| 42 |
|
|
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) |
| 43 |
|
|
{ |
| 44 |
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n"; |
| 45 |
dmorgan |
68279 |
+ $infoline = "WARNING: Removing file $filename from file list.\n"; |
| 46 |
dmorgan |
42455 |
push( @installer::globals::logfileinfo, $infoline); |
| 47 |
|
|
|
| 48 |
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n"); |
| 49 |
|
|
- $error_occured = 1; |
| 50 |
dmorgan |
68279 |
+ push(@missingfiles, "WARNING: File not found: $filename\n"); |
| 51 |
dmorgan |
42455 |
|
| 52 |
|
|
next; # removing this file from list, if sourcepath is empty |
| 53 |
|
|
} |
| 54 |
dmorgan |
68279 |
--- 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 |
| 56 |
dmorgan |
42455 |
@@ -53,7 +53,7 @@ |
| 57 |
dmorgan |
68279 |
( $installer::globals::packageformat eq "archive" )) |
| 58 |
|
|
{ |
| 59 |
|
|
$installer::globals::is_simple_packager_project = 1; |
| 60 |
|
|
- $installer::globals::patch_user_dir = 1; |
| 61 |
|
|
+ $installer::globals::patch_user_dir = 0; |
| 62 |
|
|
} |
| 63 |
|
|
elsif( $installer::globals::packageformat eq "dmg" ) |
| 64 |
|
|
{ |
| 65 |
|
|
|
Parent Directory
| 
Revision Log