/[packages]/cauldron/libreoffice/releases/3.3.1.2/1.mga1/SOURCES/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
ViewVC logotype

Contents of /cauldron/libreoffice/releases/3.3.1.2/1.mga1/SOURCES/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 389214 - (show annotations) (download)
Thu Jan 17 21:30:27 2013 UTC (11 years, 3 months ago) by pterjan
File size: 2424 byte(s)
oops
1 --- solenv/bin/modules/installer/scriptitems.pm~ 2010-12-17 21:05:04.000000000 +0100
2 +++ solenv/bin/modules/installer/scriptitems.pm 2011-01-27 20:29:19.478565400 +0100
3 @@ -1061,7 +1061,7 @@
4 {
5 if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
6 {
7 - $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file
8 + $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file
9 }
10 else
11 {
12 @@ -1360,11 +1360,10 @@
13
14 if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
15 {
16 - $infoline = "ERROR: Removing file $filename from file list.\n";
17 + $infoline = "WARNING: Removing file $filename from file list.\n";
18 push( @installer::globals::logfileinfo, $infoline);
19
20 - push(@missingfiles, "ERROR: File not found: $filename\n");
21 - $error_occured = 1;
22 + push(@missingfiles, "WARNING: File not found: $filename\n");
23
24 next; # removing this file from list, if sourcepath is empty
25 }
26 @@ -1372,11 +1371,10 @@
27 {
28 if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
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_occured = 1;
36 + push(@missingfiles, "WARNING: File not found: $filename\n");
37
38 next; # removing this file from list, if sourcepath is empty
39 }
40 --- solenv/bin/modules/installer/simplepackage.pm~ 2010-12-17 21:05:04.000000000 +0100
41 +++ solenv/bin/modules/installer/simplepackage.pm 2011-01-27 20:29:43.604565330 +0100
42 @@ -53,7 +53,7 @@
43 ( $installer::globals::packageformat eq "archive" ))
44 {
45 $installer::globals::is_simple_packager_project = 1;
46 - $installer::globals::patch_user_dir = 1;
47 + $installer::globals::patch_user_dir = 0;
48 }
49 elsif( $installer::globals::packageformat eq "dmg" )
50 {

  ViewVC Help
Powered by ViewVC 1.1.30