[apache2] 01/03: Don't leave with RC=1 when purging a conf which does not exist anymore

[Arno Töll]

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

atoell-guest pushed a commit to branch master
in repository apache2.

commit ecc2339e857c55bd0bd4a73e8fa680da1485f614
Author: Arno Töll <arno at debian.org>
Date:   Sat Nov 2 15:38:30 2013 +0100

    Don't leave with RC=1 when purging a conf which does not exist anymore
---
 debian/a2enmod   |    2 ++
 debian/changelog |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/a2enmod b/debian/a2enmod
index 2ccefee..6c0da16 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -166,6 +166,8 @@ sub doit {
 
         if ( $purge ) {
             switch_marker( $obj, $act, $acton );
+            # exit silently, we are purging anyway
+            return 1;
         }
 
         error("$name $acton does not exist!\n");
diff --git a/debian/changelog b/debian/changelog
index 144cdc3..a74ae18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ apache2 (2.4.6-4) UNRELEASED; urgency=low
     exists" by using a condition in preinst which actually works as expected.
     Thanks to Jean-Michel Vourgère for triaging the issue and providing a
     patch(Closes: #711493).
+  * Leave a2disconf with rc=0 when purging a configuration which does not
+    exist. (Closes: #718166)
 
- -- Arno Töll <arno at debian.org>  Sun, 27 Oct 2013 18:40:00 +0100
+ -- Arno Töll <arno at debian.org>  Sat, 02 Nov 2013 15:33:08 +0100
 
 apache2 (2.4.6-3) unstable; urgency=low
 

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