git-cvsserver: fix disabling service via per-method config
When the per-method enable logic disables the access, we should not even look at the global one. git-cvsserver.perl | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
f95c6780c2
commit
523d12e500
@ -192,11 +192,9 @@ sub req_Root
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unless ( ($cfg->{gitcvs}{$state->{method}}{enabled}
|
my $enabled = ($cfg->{gitcvs}{$state->{method}}{enabled}
|
||||||
and $cfg->{gitcvs}{$state->{method}}{enabled} =~ /^\s*(1|true|yes)\s*$/i)
|
|| $cfg->{gitcvs}{enabled});
|
||||||
or ($cfg->{gitcvs}{enabled}
|
unless ($enabled && $enabled =~ /^\s*(1|true|yes)\s*$/i) {
|
||||||
and $cfg->{gitcvs}{enabled} =~ /^\s*(1|true|yes)\s*$/i) )
|
|
||||||
{
|
|
||||||
print "E GITCVS emulation needs to be enabled on this repo\n";
|
print "E GITCVS emulation needs to be enabled on this repo\n";
|
||||||
print "E the repo config file needs a [gitcvs] section added, and the parameter 'enabled' set to 1\n";
|
print "E the repo config file needs a [gitcvs] section added, and the parameter 'enabled' set to 1\n";
|
||||||
print "E \n";
|
print "E \n";
|
||||||
|
Loading…
Reference in New Issue
Block a user