1 |
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 |
@@ -1066,7 +1066,7 @@ |
9 |
} |
10 |
else |
11 |
{ |
12 |
- $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 |
@@ -1144,7 +1144,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 |
@@ -1356,11 +1356,10 @@ |
27 |
|
28 |
if ( ! $installer::globals::languagepack && !$installer::globals::helppack) |
29 |
{ |
30 |
- $infoline = "ERROR: Removing file $filename from file list.\n"; |
31 |
+ $infoline = "WARNING: Removing file $filename from file list.\n"; |
32 |
push( @installer::globals::logfileinfo, $infoline); |
33 |
|
34 |
- push(@missingfiles, "ERROR: File not found: $filename\n"); |
35 |
- $error_occurred = 1; |
36 |
+ push(@missingfiles, "WARNING: File not found: $filename\n"); |
37 |
|
38 |
next; # removing this file from list, if sourcepath is empty |
39 |
} |
40 |
@@ -1368,11 +1367,10 @@ |
41 |
{ |
42 |
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) |
43 |
{ |
44 |
- $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_occurred = 1; |
50 |
+ push(@missingfiles, "WARNING: File not found: $filename\n"); |
51 |
|
52 |
next; # removing this file from list, if sourcepath is empty |
53 |
} |
54 |
@@ -1390,11 +1388,10 @@ |
55 |
{ |
56 |
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) |
57 |
{ |
58 |
- $infoline = "ERROR: Removing file $filename from file list.\n"; |
59 |
+ $infoline = "WARNING: Removing file $filename from file list.\n"; |
60 |
push( @installer::globals::logfileinfo, $infoline); |
61 |
|
62 |
- push(@missingfiles, "ERROR: File not found: $filename\n"); |
63 |
- $error_occurred = 1; |
64 |
+ push(@missingfiles, "WARNING: File not found: $filename\n"); |
65 |
|
66 |
next; # removing this file from list, if sourcepath is empty |
67 |
} |
68 |
--- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100 |
69 |
+++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100 |
70 |
@@ -53,7 +53,7 @@ |
71 |
( $installer::globals::packageformat eq "archive" )) |
72 |
{ |
73 |
$installer::globals::is_simple_packager_project = 1; |
74 |
- $installer::globals::patch_user_dir = 1; |
75 |
+ $installer::globals::patch_user_dir = 0; |
76 |
} |
77 |
elsif( $installer::globals::packageformat eq "dmg" ) |
78 |
{ |