------------------------------------------------------------
revno: 1969
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sat 2010-05-08 19:04:48 +0200
message:
more safe workaround for the installer change (exclude the fakeroot stuff)
renamed:
patches/revert-installer-worker-error-reporting.diff =>
patches/installer-logfile-check-ignore-fakeroot.diff
modified:
patches/series
patches/installer-logfile-check-ignore-fakeroot.diff
=== renamed file 'patches/revert-installer-worker-error-reporting.diff' =>
'patches/installer-logfile-check-ignore-fakeroot.diff'
--- a/patches/revert-installer-worker-error-reporting.diff 2010-05-08
14:31:43 +0000
+++ b/patches/installer-logfile-check-ignore-fakeroot.diff 2010-05-08
17:04:48 +0000
@@ -1,22 +1,18 @@
--- /dev/null 2010-05-02 17:01:50.016998199 +0200
-+++
openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/revert-installer-worker-error-reporting.diff
2010-05-08 14:26:00.000000000 +0200
-@@ -0,0 +1,16 @@
-+diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
-+--- solenv/bin/modules/installer/worker.pm
-++++ solenv/bin/modules/installer/worker.pm
-+@@ -491,12 +491,6 @@
-+
-+ if ( $installer::globals::creating_windows_installer_patch ) {
$installer::globals::creating_windows_installer_patch = 0; }
-+
-+- # Exiting the packaging process, if an error occured.
-+- # This is important, to get an error code "-1", if an error was found
in the log file,
-+- # that did not break the packaging process
-+-
-+- if ( ! $is_success) { installer::exiter::exit_program("ERROR: Found
an error in the logfile. Packaging failed.", "analyze_and_save_logfile"); }
-+-
-+ return ($is_success, $finalinstalldir);
-+ }
-+
++++
openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/installer-logfile-check-ignore-fakeroot.diff
2010-05-08 16:18:58.000000000 +0200
+@@ -0,0 +1,12 @@
++diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
++--- solenv/bin/modules/installer/control.pm
+++++ solenv/bin/modules/installer/control.pm
++@@ -342,7 +342,7 @@
++ $compareline =~ s/Error\.idl//g; # removing all
occurences of "Error.idl"
++ $compareline =~ s/Error\.html//g; # removing all
occurences of "Error.html"
++
++- if ( $compareline =~ /\bError\b/i )
+++ if ( $compareline =~ /\bError\b/i && $compareline !~ /fakeroot/
)
++ {
++ $contains_error = 1;
++ push(@errors, $line);
--- openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/apply-old
2010-05-08 14:26:44.000000000 +0200
+++ openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/apply
2010-05-08 14:28:19.000000000 +0200
@@ -1212,6 +1212,11 @@
@@ -26,7 +22,7 @@
+[ DebianBaseOnly and TemporaryHacks >= ooo320-m17 ]
+# installer is run under fakeroot. fakeroot (this should be fixed, though)
+# reports an ERROR: which since m17 makes the installer fail...
-+revert-installer-worker-error-reporting.diff, rengelha
++installer-logfile-check-ignore-fakeroot.diff, rengelha
+
[ GoOoSplash ]
# move progress bar for go-oo splash
=== modified file 'patches/series'
--- a/patches/series 2010-05-08 14:31:43 +0000
+++ b/patches/series 2010-05-08 17:04:48 +0000
@@ -6,4 +6,4 @@
fix-system-mythes-for-mythes-1.2.diff
m16.diff
m17.diff
-revert-installer-worker-error-reporting.diff
+installer-logfile-check-ignore-fakeroot.diff
