[jetty9] 80/135: Fixed an error on purging jetty8 when authbind is not installed (Closes: #767337)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jetty9.

commit b7588ff0d7beed64de95d7f65aa8d8be92369527
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 30 11:08:55 2014 +0100

    Fixed an error on purging jetty8 when authbind is not installed (Closes: #767337)
---
 debian/changelog     | 7 +++++++
 debian/jetty8.postrm | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3bbb01b..234e8e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.16-4) UNRELEASED; urgency=medium
+
+  * Fixed an error on purging jetty8 when authbind is not installed
+    (Closes: #767337)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 30 Oct 2014 11:06:58 +0100
+
 jetty8 (8.1.16-3) unstable; urgency=medium
 
   * Configure Jetty to write the jetty.state file in the /var/lib/jetty8
diff --git a/debian/jetty8.postrm b/debian/jetty8.postrm
index ec0568d..100340a 100644
--- a/debian/jetty8.postrm
+++ b/debian/jetty8.postrm
@@ -35,7 +35,7 @@ case "$1" in
         rmdir --ignore-fail-on-non-empty /etc/jetty8/contexts /etc/jetty8 || true
 
         # clean up /etc/authbind after conffiles have been removed
-        rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind
+        rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind || true
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git