[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-121-gdf90ce1
Arno Töll
arno at debian.org
Fri Jun 7 16:45:33 UTC 2013
The following commit has been merged in the master branch:
commit 39e1757597a533dc20dfe8dea8656b6fbce69a32
Author: Arno Töll <arno at debian.org>
Date: Fri Jun 7 15:09:47 2013 +0200
Be more verbose in the init script. It's _ENTIRELY_ unclear what the LSB recommendation of that is. See #710519, #683654 and #710571
diff --git a/debian/apache2.init b/debian/apache2.init
index a9f215f..863eff7 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -265,12 +265,12 @@ fi
case "$1" in
start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ log_daemon_msg "Starting $DESC" "$NAME"
do_start
RET_STATUS=$?
case "$RET_STATUS" in
0|1)
- [ "$VERBOSE" != no ] && log_end_msg 0
+ log_end_msg 0
[ "$VERBOSE" != no ] && [ $RET_STATUS = 1 ] && log_warning_msg "Server was already running"
if check_htcacheclean ; then
[ "$VERBOSE" != no ] && log_daemon_msg "Starting HTTP cache cleaning daemon" "htcacheclean"
@@ -279,23 +279,23 @@ case "$1" in
fi
;;
2)
- [ "$VERBOSE" != no ] && log_end_msg 1
+ log_end_msg 1
[ -n "$APACHE2_INIT_MESSAGE" ] && echo $APACHE2_INIT_MESSAGE >&2
log_failure_msg
;;
esac
;;
stop|graceful-stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ log_daemon_msg "Stopping $DESC" "$NAME"
do_stop "$1"
RET_STATUS=$?
case "$RET_STATUS" in
0|1)
- [ "$VERBOSE" != no ] && log_end_msg 0
+ log_end_msg 0
[ "$VERBOSE" != no ] && [ $RET_STATUS = 1 ] && log_warning_msg "Server was not running"
;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 2) log_end_msg 1 ;;
esac
[ "$VERBOSE" != no ] && [ "x$APACHE2_INIT_MESSAGE" != "x" ] && log_warning_msg "$APACHE2_INIT_MESSAGE"
diff --git a/debian/changelog b/debian/changelog
index ff59d77..9efc775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
file (Closes: #711483)
* Apply patch submitted by Robert Luberda and redirect all output of
apache2-maintscript-helper to stderr (Closes: #711478)
+ * Tell about essential operations in the init script (Closes: #711120)
- -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 14:09:17 +0200
+ -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 15:07:48 +0200
apache2 (2.4.4-5) unstable; urgency=low
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list