diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2013-07-14 21:42:46 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2013-07-14 21:42:46 +0200 |
| commit | c3a667edca902a28b84db7a4795a1029db89cf6d (patch) | |
| tree | 5b7e035e239182e1aec6d641518249f28644ca06 | |
| parent | 5adeba53e55c5f5560e833849cc3d0f300692d78 (diff) | |
| download | apache2-c3a667edca902a28b84db7a4795a1029db89cf6d.tar.gz | |
Don't fail postinst/postrm if restart/configtest fails
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9a9f1be8..3b51e685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apache2 (2.4.4-7) UNRELEASED; urgency=low + [ Arno Töll ] * Document our security model in our NEWS file and highlight we do not allow access to /srv. Thanks to joeyh for pointing this out. * Allow the use of apache2-maintscript-helper from a sub-function. We rely @@ -8,6 +9,10 @@ apache2 (2.4.4-7) UNRELEASED; urgency=low cases. * Mention that the dh_apache2 conditional must be present in postrm too (Closes: #716694) + [ Stefan Fritsch ] + * Don't fail package upgrade or removal just because the configuration is in + an inconsistent state. Closes: #716921 + -- Arno Töll <arno@debian.org> Sat, 13 Jul 2013 22:20:05 +0200 apache2 (2.4.4-6) unstable; urgency=low diff --git a/debian/rules b/debian/rules index a58cae13..e31c5439 100755 --- a/debian/rules +++ b/debian/rules @@ -124,8 +124,7 @@ override_dh_fixperms-indep: dh_fixperms -i override_dh_installinit: - dh_installinit --restart-after-upgrade -- defaults 91 09 - + dh_installinit --restart-after-upgrade --error-handler=true -- defaults 91 09 override_dh_installdocs-indep: # TODO: So, did anyone check convert_docs needs an update? ;) |