[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 589d59e69495e1f93998631bc3a05688fb72db75
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jan 13 11:10:34 2012 +0100
make preinst cleanup a bit more robust (LP: #915271)
diff --git a/changelog b/changelog
index 4ade421..96ce8cc 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,7 @@ libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
* enable human theme and make it the default for gtk desktops
* cherry-pick Replaces commit from 3.4 (LP: #705343)
* cherry-pick demotion of java-Recommends for -writer to Suggests
+ * make preinst cleanup a bit more robust (LP: #915271)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 13 Jan 2012 11:09:32 +0100
diff --git a/libreoffice-core.preinst.in b/libreoffice-core.preinst.in
index 3dc3478..f600700 100755
--- a/libreoffice-core.preinst.in
+++ b/libreoffice-core.preinst.in
@@ -5,8 +5,9 @@ set -e
#INCLUDE_SHELL_LIB#
if [ "$1" = "upgrade" -o "$1" = "install" ]; then
- rm -f `echo @OODIR@ | sed -e s,/usr/,/var,g`/basis3.4/program/services.rdb
- rmdir `echo @OODIR@ | sed -e s,/usr/,/var,g`/basis3.4/program/
+ rm -f `echo @OODIR@ | sed -e s,usr/,/var/,g`/basis3.4/program/services.rdb
+ #workaround for lp#915271
+ rmdir -p `echo @OODIR@ | sed -e s,usr/,/var/,g`/basis3.4/program/ || true
fi
#DEBHELPER#
--
LibreOffice packaging repository
Reply to: