gitweb: Die if there are parsing errors in config file

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 8d6a7e94d1180299a8b68ea9af34be23b6d057ae2b18412cf994e5406c66c7c9..384a68ebe1ac784b7bb276982b53258b74cb85dc39c4af72bddaded7ad2f739d 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -551,11 +551,14 @@ sub filter_snapshot_fmts {
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
+our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
+# die if there are errors parsing config file
 if (-e $GITWEB_CONFIG) {
        do $GITWEB_CONFIG;
-} else {
-       our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
-       do $GITWEB_CONFIG_SYSTEM if -e $GITWEB_CONFIG_SYSTEM;
+       die $@ if $@;
+} elsif (-e $GITWEB_CONFIG_SYSTEM) {
+       do $GITWEB_CONFIG_SYSTEM;
+       die $@ if $@;
 }
 
 # Get loadavg of system, to compare against $maxload.