From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:49:28 +0000 (-0500)
Subject: debian packaging: removing unnecessary error masking in {pre,post}rm
X-Git-Tag: monkeysphere_0.21-2~2
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=6f58fa33e52e45d25e2221fbd7c8179c688061b4

debian packaging: removing unnecessary error masking in {pre,post}rm
---

diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm
index 8f87ed3..ffb6b6e 100755
--- a/packaging/debian/monkeysphere.postrm
+++ b/packaging/debian/monkeysphere.postrm
@@ -7,7 +7,7 @@
 
 case $1 in
     purge)
-        rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere || true
+        rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere
         echo "removing monkeysphere user..."
         userdel monkeysphere > /dev/null || true
         ;;
diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm
index 05b29e6..00523a1 100755
--- a/packaging/debian/monkeysphere.prerm
+++ b/packaging/debian/monkeysphere.prerm
@@ -9,8 +9,8 @@ VARLIB="/var/lib/monkeysphere"
 
 rm -f "$VARLIB"/gnupg-host/gpg.conf
 rm -f "$VARLIB"/gnupg-authentication/gpg.conf
-rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host || true
-rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication || true
+rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host
+rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.