From: Bruno Cesar Ribas <ribas@c3sl.ufpr.br>
Date: Wed, 13 Feb 2008 00:52:02 GMT
Subject: Re: [PATCH] gitweb: Use the config file to set repository owner's name.
Message-ID: <20080213005202.GA5965@c3sl.ufpr.br>
In-Reply-To: <1202488684-13266-2-git-send-email-ribas@c3sl.ufpr.br>

Was it forgotten ? 8^)

On Fri, Feb 08, 2008 at 02:38:03PM -0200, Bruno Ribas wrote:
> Now gitweb checks if gitweb.owner exists before trying to get filesystem's
> owner.
> 
> Allow to use configuration variable gitweb.owner set the repository owner,
> it checks the gitweb.owner, if not set it uses filesystem directory's owner.
> 
> Useful when we don't want to maintain project list file, and all
> repository directories have to have the same owner (for example when the
> same SSH account is shared for all projects, using ssh_acl to control
> access instead).
> 
> Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br>
> ---
>  gitweb/gitweb.perl |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 8ef2735..c8fe22a 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -1759,6 +1759,7 @@ sub git_get_project_owner {
>  	my $owner;
>  
>  	return undef unless $project;
> +	$git_dir = "$projectroot/$project";
>  
>  	if (!defined $gitweb_project_owner) {
>  		git_get_project_list_from_file();
> @@ -1767,8 +1768,11 @@ sub git_get_project_owner {
>  	if (exists $gitweb_project_owner->{$project}) {
>  		$owner = $gitweb_project_owner->{$project};
>  	}
> +	if (!defined $owner){
> +		$owner = git_get_project_config('owner');
> +	}
>  	if (!defined $owner) {
> -		$owner = get_file_owner("$projectroot/$project");
> +		$owner = get_file_owner("$git_dir");
>  	}
>  
>  	return $owner;
> -- 
> 1.5.4.24.gce08d

-- 
Bruno Ribas - ribas@c3sl.ufpr.br
http://web.inf.ufpr.br/ribas
C3SL: http://www.c3sl.ufpr.br