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

From

James <purpleidea@gmail.com>

Date

Aug 10, 2010, 15:54 UTC

Message-ID

<AANLkTi=UCJa9uT5i9TRB9hGsH1D8b9DgB49TPM5k1htQ@mail.gmail.com>

In-Reply-To

<vpq4of2scen.fsf@bauges.imag.fr>

>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.

Signed-off-by: James Shubin <purpleidea@gmail.com>
---
 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



On 8/10/10, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:
> Hi,
>
>
>  James <purpleidea@gmail.com> writes:
>
>  > Hi git list, my name is James, and this is my first patch.
>
>
> Then, I'll have to be the first person directing you to
>  Documentation/SubmittingPatches ;-).
>
>  The custom here is to send patches inline (git send-email can help),
>  not attached. Read about Signed-off-by too.
>
>  (Don't know perl and gitweb enough to judge on the content
>  unfortunately, sorry)
>
>
>  --
>  Matthieu Moy
>  http://www-verimag.imag.fr/~moy/
>