Re: [Patch] Use a default for a bad env config file variable
James venit, vidit, dixit 10.08.2010 17:54:
Show 8 quoted lines
> Sorry about that,
> I guess I had only read the README.
> Hope this is better:
>
> 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.
Now, make that commit subject
gitweb: Use a default for a bad env config file variable
(i.e. insert "gitweb: ", delete the stop) and you're good to go ;)
Michael
Show 22 quoted lines
>
>
> 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 $@;
> }
> }
> Michael J Gruber <git@drmicha.warpmail.net>