[apache2] 02/02: style tweaks

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit ed3859f814071d2532f70c09bc16c2f5c78c8c3a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Mar 26 10:05:47 2016 +0100

    style tweaks
    
    no logic change
---
 debian/a2enmod | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/a2enmod b/debian/a2enmod
index e0a540d..fb63d26 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -32,15 +32,17 @@ my $act        = $1;
 my $obj        = $2;
 my $dir_suffix = $3;
 
-my @essential_module_list = (qw/alias auth_basic authn_file/,
-    qw/authz_host authz_user autoindex deflate dir env filter logio/,
-    qw/mime negotiation setenvif unixd version watchdog/);
-my $env_file = $ENV{APACHE_ENVVARS}
-    || (
-    $ENV{APACHE_CONFDIR}
-    ? "$ENV{APACHE_CONFDIR}/envvars"
-    : "/etc/apache2$dir_suffix/envvars"
-    );
+my @essential_module_list = qw(alias auth_basic authn_file authz_host
+    authz_user autoindex deflate dir env filter logio mime negotiation
+    setenvif unixd version watchdog);
+my $env_file = $ENV{APACHE_ENVVARS};
+if (! $env_file) {
+    if ($ENV{APACHE_CONFDIR}) {
+        $env_file = "$ENV{APACHE_CONFDIR}/envvars";
+    } else {
+        $env_file = "/etc/apache2$dir_suffix/envvars";
+    }
+}
 $ENV{LANG} = 'C';
 read_env_file($env_file);
 

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