[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-15-g50179ea

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 50179ea3fd73da976f83e433e2a04cf409ea1c03
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 22:10:22 2012 +0200

    If apache2 is not running, make "/etc/init.d/apache2 reload" skip
    the configtest.
    
    This avoids ugly error messages during upgrade

diff --git a/debian/apache2.2-common.apache2.init b/debian/apache2.2-common.apache2.init
index 2a53c49..f49cd55 100644
--- a/debian/apache2.2-common.apache2.init
+++ b/debian/apache2.2-common.apache2.init
@@ -211,18 +211,22 @@ case $1 in
                 fi
 	;;
 	reload | force-reload | graceful)
-		if ! $APACHE2CTL configtest > /dev/null 2>&1; then
-                    $APACHE2CTL configtest || true
-                    log_end_msg 1
-                    exit 1
-                fi
-                log_daemon_msg "Reloading web server config" "apache2"
-		if pidof_apache > /dev/null ; then
+                log_daemon_msg "Reloading web server config"
+                if pidof_apache > /dev/null ; then
+                    log_progress_msg "apache2"
+                    if ! $APACHE2CTL configtest > /dev/null 2>&1; then
+                        log_end_msg 1
+                        $APACHE2CTL configtest || true
+                        exit 1
+                    fi
                     if $APACHE2CTL graceful $2 ; then
                         log_end_msg 0
                     else
                         log_end_msg 1
                     fi
+                else
+                    log_progress_msg "apache2 not running"
+                    log_end_msg 0
                 fi
 	;;
 	restart)
diff --git a/debian/changelog b/debian/changelog
index d7e47a0..cfeb77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
   * Add "AddCharset" for .brf files in default mod_mime config.
     Closes: #402567
   * Compile mod_version statically, drop associated module load file.
+  * If apache2 is not running, make "/etc/init.d/apache2 reload" skip the
+    configtest.
   * Don't create httpd.conf anymore and don't include it in apache2.conf. If
     it contains local modifications, move it to /etc/apache2/conf.d/httpd.conf
   * Note in README.Debian that future versions of the package will have the

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)