[Patch] Use a default for a bad env config file variable

From: James <purpleidea@gmail.com>
Date: Aug 10, 2010, 15:11 UTC
Message-ID: <AANLkTi=42V8=26oEwcNOHubuK+VAf-QaYnvCLAKQ0xtg@mail.gmail.com>

Hi git list, my name is James, and this is my first patch.

It's quite trivial really, all that changes is that if someone sets the environment variable: $GITWEB_CONFIG_SYSTEM, and this points to something like: /srv/gitosis/gitweb.conf, which doesn't actually exist, then gitweb will default to trying out the built in default of /etc/gitweb.conf (if it was built with that var).

This patch should make it easier for people who are configuring gitweb+gitosis, so that a separate gitweb.conf config file can be used to call the main config, but which doesn't null out the system defaults if it is missing.

Thank you in advance, _James

From d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001
From: James Shubin <purpleidea@gmail.com>
Date: Tue, 10 Aug 2010 10:30:22 -0400
Subject: [PATCH] Use a default for a bad env config file variable.

---
 gitweb/gitweb.perl |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4efeebc..43294e1 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -605,6 +605,10 @@ sub evaluate_gitweb_config {
 	} elsif (-e $GITWEB_CONFIG_SYSTEM) {
 		do $GITWEB_CONFIG_SYSTEM;
 		die $@ if $@;
+	# if config file from env is missing, then try the default anyways
+	} elsif (-e "++GITWEB_CONFIG_SYSTEM++") {
+		do "++GITWEB_CONFIG_SYSTEM++";
+		die $@ if $@;
 	}
 }

-- 
1.7.0.4