summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Töll <arno@debian.org>2013-11-02 15:38:30 +0100
committerArno Töll <arno@debian.org>2013-11-02 15:38:30 +0100
commitecc2339e857c55bd0bd4a73e8fa680da1485f614 (patch)
treeb46452b2f1b134f59605902198fe23f61ffa1c72
parent0f878d006845999dc34222eec2c6297f3f7048c2 (diff)
downloadapache2-ecc2339e857c55bd0bd4a73e8fa680da1485f614.tar.gz
Don't leave with RC=1 when purging a conf which does not exist anymore
-rwxr-xr-xdebian/a2enmod2
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/a2enmod b/debian/a2enmod
index 2ccefee2..6c0da166 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 144cdc36..a74ae18d 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@debian.org> Sun, 27 Oct 2013 18:40:00 +0100
+ -- Arno Töll <arno@debian.org> Sat, 02 Nov 2013 15:33:08 +0100
apache2 (2.4.6-3) unstable; urgency=low