deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make repo patterns work in fragment-named groups

Browse source
This commit is contained in:
Kevin P. Fleming 2010-07-27 17:00:36 -05:00 committed by Sitaram Chamarty
parent 204b34e525
commit a5601970da
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/gl-compile-conf
View file

@ -144,6 +144,25 @@ sub expand_list
# "compile" GL conf # "compile" GL conf
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
sub check_fragment_repo_disallowed
{
# trying to set access for $repo (='foo')...
my ($fragment, $repo) = @_;
# processing the master config, not a fragment
return 0 if $fragment eq 'master';
# fragment is also called 'foo' (you're allowed to have a
# fragment that is only concerned with one repo)
return 0 if $fragment eq $repo;
# same thing in big-config-land; foo is just @foo now
return 0 if $GL_BIG_CONFIG and ("\@$fragment" eq $repo);
my @matched = grep { $repo =~ /^$_$/ }
grep { $groups{"\@$fragment"}{$_} eq 'master' }
sort keys %{ $groups{"\@$fragment"} };
return 0 if @matched > 0;
return 1;
}
sub parse_conf_file sub parse_conf_file
{ {
my ($conffile, $fragment) = @_; my ($conffile, $fragment) = @_;
@ -234,33 +253,11 @@ sub parse_conf_file
# rights on stuff outside his domain # rights on stuff outside his domain
# trying to set access for $repo (='foo')... # trying to set access for $repo (='foo')...
if ( if (check_fragment_repo_disallowed($fragment, $repo))
# processing the master config, not a fragment {
( $fragment eq 'master' ) or
# fragment is also called 'foo' (you're allowed to have a
# fragment that is only concerned with one repo)
( $fragment eq $repo ) or
# same thing in big-config-land; foo is just @foo now
( $GL_BIG_CONFIG and "\@$fragment" eq $repo ) or
# fragment is called "bar" and "@bar = foo" has been
# defined in the master config
( ($groups{"\@$fragment"}{$repo} || '') eq 'master' )
) {
# all these are fine
} else {
# this is a little more complex
# fragment is called "bar", one or more "@bar = regex"
# have been specified in master, and "foo" matches some
# such "regex"
my @matched = grep { $repo =~ /^$_$/ }
grep { $groups{"\@$fragment"}{$_} eq 'master' }
sort keys %{ $groups{"\@$fragment"} };
if (@matched < 1) {
$ignored{$fragment}{$repo} = 1; $ignored{$fragment}{$repo} = 1;
next; next;
} }
}
for my $user (@users) for my $user (@users)
{ {
# lint check, to catch pubkey/username typos # lint check, to catch pubkey/username typos
@ -339,8 +336,7 @@ sub parse_conf_file
{ {
my ($repo, $owner, $desc) = ($1, $2, $3); my ($repo, $owner, $desc) = ($1, $2, $3);
die "$ABRT bad repo name $repo\n" unless $repo =~ $REPONAME_PATT; die "$ABRT bad repo name $repo\n" unless $repo =~ $REPONAME_PATT;
die "$WARN $fragment attempting to set description for $repo\n" if die "$WARN $fragment attempting to set description for $repo\n" if check_fragment_repo_disallowed($fragment, $repo);
$fragment ne 'master' and $fragment ne $repo and ($groups{"\@$fragment"}{$repo} || '') ne 'master';
$desc{"$repo.git"} = $desc; $desc{"$repo.git"} = $desc;
$owner{"$repo.git"} = $owner || ''; $owner{"$repo.git"} = $owner || '';
} }