./packages/openofficeorg/3.1.1/unstable r1869: also add || true to hared/openofficeorg-running for safety
------------------------------------------------------------
revno: 1869
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-02-15 11:42:03 +0100
message:
also add || true to hared/openofficeorg-running for safety
modified:
changelog
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-02-14 19:34:22 +0000
+++ b/changelog 2010-02-15 10:42:03 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.1-16) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-16) UNRELEASED; urgency=medium
* ooo-build:
- update (7def808a74496dc37aebfeb90304b209124ec904)
@@ -18,9 +18,8 @@
* debian/rules:
- wrap KDELIBS_MINVER for KDE4 into ifneq "$(LENNY_BACKPORT)" "y" as it
for some reason also gets used for lenny-backports which has KDE3..
- * debian/ure.preinst:
- - add a || true to db_input for ure/possibly_corrupted_rdbs
- (closes: #569840)
+ * debian/ure.preinst, debian/shell-lib-{extensions,components}:
+ - add a || true to db_input/db_go where missing (closes: #569840)
-- Rene Engelhard <rene@debian.org> Sun, 14 Feb 2010 20:28:51 +0100
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-01-24 20:06:59 +0000
+++ b/shell-lib-components.sh 2010-02-15 10:42:03 +0000
@@ -16,8 +16,8 @@
echo "upgrade." >&2
exit 1
else
- db_input high shared/openofficeorg-running
- db_go
+ db_input high shared/openofficeorg-running || true
+ db_go || true
# try again in case OOo got closed before hitting OK
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-01-24 20:06:59 +0000
+++ b/shell-lib-extensions.sh 2010-02-15 10:42:03 +0000
@@ -16,8 +16,8 @@
echo "upgrade." >&2
exit 1
else
- db_input high shared/openofficeorg-running
- db_go
+ db_input high shared/openofficeorg-running || true
+ db_go || true
# try again in case OOo got closed before hitting OK
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
Reply to: