[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-5-g9633098
The following commit has been merged in the master branch:
commit 326f8b4f339c227ea505bf8c51ae6f03195eb023
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 5 14:23:22 2012 +0200
debian/libreoffice-core.preinst.in: silence rmdir
diff --git a/changelog b/changelog
index 5e931bb..928484c 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
* debian/rules:
- strip ure from uno-libs3.substvars again after the .symbols change
(closes: #667465)
+ * debian/libreoffice-core.preinst.in: silence rmdir
- -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 14:15:42 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 14:22:45 +0200
libreoffice (1:3.5.2-1) unstable; urgency=low
diff --git a/libreoffice-core.preinst.in b/libreoffice-core.preinst.in
index 32b03d7..550d918 100755
--- a/libreoffice-core.preinst.in
+++ b/libreoffice-core.preinst.in
@@ -6,8 +6,8 @@ set -e
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/ || true
- rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4 || true
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4/program/ 2>/dev/null || true
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4 2>/dev/null || true
fi
#DEBHELPER#
--
LibreOffice packaging repository
Reply to: