[apache2] 01/02: Don't use 'set -e' in secondary-init-script

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit d1a700efdd79f7cf2a516a636c7ce91d8045f2d7
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 31 23:15:01 2015 +0100

    Don't use 'set -e' in secondary-init-script
    
    It sources the main init script, which is not designed to work with
    'set -e'
---
 debian/changelog             | 2 ++
 debian/secondary-init-script | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8759488..6d90052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apache2 (2.4.17-2) UNRELEASED; urgency=medium
 
   * Revert REDIRECT_URL to pre-2.4.17 behavior for now. The change broke
     lots of web-apps. Closes: #803353
+  * Fix secondary-init-script to not source the main init script with 'set -e'.
+    Closes: #803177
   * mod_http2: Write HTTP/2 into THE_REQUEST and the access log.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 31 Oct 2015 22:51:31 +0100
diff --git a/debian/secondary-init-script b/debian/secondary-init-script
index 7b0c5c4..8cdfa30 100644
--- a/debian/secondary-init-script
+++ b/debian/secondary-init-script
@@ -9,8 +9,6 @@
 # Short-Description: Start/stop apache2 web server (config /etc/apache2-XXX)
 ### END INIT INFO
 
-set -e
-
 #
 # this init script can be installed as /etc/init.d/apache2-XXX
 #

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