[apache2] 06/06: 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 jessie
in repository apache2.

commit 4e6ef34ca737f4585f5e7e2823d3ce551675a37b
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 e494c96..c54f5d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apache2 (2.4.10-10+deb8u4) UNRELEASED; urgency=medium
   * Fix tests on deferred mpm switch. Add special casing for mpm_itk,
     which is not an mpm anymore, despite the name. Closes: #789914
     Closes: #791902
+  * Fix secondary-init-script to not source the main init script with 'set -e'.
+    Closes: #803177
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 28 Nov 2015 13:48:49 +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