[apache2] 01/01: Fix a2query return codes for fail() conditions

[Arno Töll]

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

atoell-guest pushed a commit to branch master
in repository apache2.

commit 0e26141c6b013a9c889f02f1e2077834d38228f0
Author: Arno Töll <arno at debian.org>
Date:   Tue Oct 7 03:50:11 2014 -1100

    Fix a2query return codes for fail() conditions
---
 debian/a2query.in | 10 +++++-----
 debian/changelog  |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/a2query.in b/debian/a2query.in
index 47a60f2..555ea1d 100755
--- a/debian/a2query.in
+++ b/debian/a2query.in
@@ -4,7 +4,7 @@
 # Copyright (C) 2012 Arno Töll <debian at toell.net>
 #
 # This program is licensed at your choice under the terms of the GNU General
-# Public License vserion 2+ or under the terms of the Apache Software License
+# Public License version 2+ or under the terms of the Apache Software License
 # 2.0.
 #
 # For GPL-2+:
@@ -203,7 +203,7 @@ sub load_defaults
 sub load_modules
 {
 	my $conf_dir = $CONFIG_DIR . "/mods-enabled";
-	opendir(DIR, $conf_dir) || fail("$conf_dir: $!");
+	opendir(DIR, $conf_dir) || fail("$conf_dir: $!", 1);
 	while( readdir(DIR) )
 	{
 		my $file = $_;
@@ -214,7 +214,7 @@ sub load_modules
 			$MPM = $1 if $MPM eq 'invalid';
 			if(grep { $_ =~ m/^mpm_/ } @MODULES)
 			{
-				fail("There is more than one MPM loaded. Do not proceed due to undefined results");
+				fail("There is more than one MPM loaded. Do not proceed due to undefined results", 1);
 			}
 		}
 		push @MODULES, $file;
@@ -230,7 +230,7 @@ sub load_conf
 		return;
 	}
 	my $conf_dir = $CONFIG_DIR . "/conf-enabled";
-	opendir(DIR, $conf_dir) || fail("$conf_dir: $!");
+	opendir(DIR, $conf_dir) || fail("$conf_dir: $!", 1);
 	while( readdir(DIR) )
 	{
 		my $file = $_;
@@ -249,7 +249,7 @@ sub load_sites
 		return;
 	}
 	my $conf_dir = $CONFIG_DIR . "/sites-enabled";
-	opendir(DIR, $conf_dir) || fail("$conf_dir: $!");
+	opendir(DIR, $conf_dir) || fail("$conf_dir: $!", 1);
 	while( readdir(DIR) )
 	{
 		my $file = $_;
diff --git a/debian/changelog b/debian/changelog
index ed85ecf..f45b32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 apache2 (2.4.10-4) UNRELEASED; urgency=medium
 
+  [ Stefan Fritsch ]
   * Make apache2 depend on apache2-utils. This got lost somewhere in the
     2.4 update.
+  [ Arno Töll ]
+  * Add proper return codes to fail() conditions in a2query. Thanks to Ondřej
+    Surý for providing a patch.
 
- -- Stefan Fritsch <sf at debian.org>  Mon, 29 Sep 2014 22:25:49 +0200
+ -- Arno Töll <arno at debian.org>  Tue, 07 Oct 2014 03:48:39 -1100
 
 apache2 (2.4.10-3) unstable; urgency=medium
 

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