diff options
| author | Arno Töll <arno@debian.org> | 2014-10-07 03:50:11 -1100 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2014-10-07 03:50:11 -1100 |
| commit | 0e26141c6b013a9c889f02f1e2077834d38228f0 (patch) | |
| tree | b6bfba04b51f1232cca154db4d46cc500e6ba5b9 /debian/a2query.in | |
| parent | 893cf6ce30cc401d08efef904f792581657d05f1 (diff) | |
| download | apache2-0e26141c6b013a9c889f02f1e2077834d38228f0.tar.gz | |
Fix a2query return codes for fail() conditions
Diffstat (limited to 'debian/a2query.in')
| -rwxr-xr-x | debian/a2query.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/a2query.in b/debian/a2query.in index 47a60f2b..555ea1d3 100755 --- a/debian/a2query.in +++ b/debian/a2query.in @@ -4,7 +4,7 @@ # Copyright (C) 2012 Arno Töll <debian@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 = $_; |