aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaram@atc.tcs.com>2010-02-18 06:10:08 +0530
committerSitaram Chamarty <sitaram@atc.tcs.com>2010-02-18 06:10:08 +0530
commit16cea9bf8c7c040db559dd2d8888e8dfede37af5 (patch)
treea71702c3ba24e87b08d2590985546b487406056d
parentdoc/0: added uninstall instructions (diff)
downloadgitolite-gentoo-16cea9bf8c7c040db559dd2d8888e8dfede37af5.tar.gz
gitolite-gentoo-16cea9bf8c7c040db559dd2d8888e8dfede37af5.tar.bz2
gitolite-gentoo-16cea9bf8c7c040db559dd2d8888e8dfede37af5.zip
compile: move checking of reponame/repopatt/username out of expand_list
let expand_list be just that "expand a list", and leave checking to be done outside. otherwise, commit 690604d79 has the side effect of restricting refs to $REPOPATT_PATT, and so for instance barfing on the perfectly valid RW+ refs/(?!heads/master) = alice bob (thanks to Teemu for catching this)
-rwxr-xr-xsrc/gl-compile-conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gl-compile-conf b/src/gl-compile-conf
index 371e912..842a30a 100755
--- a/src/gl-compile-conf
+++ b/src/gl-compile-conf
@@ -133,8 +133,6 @@ sub expand_list
for my $item (@list)
{
- die "$ABRT bad user or repo name $item\n"
- unless ($GL_WILDREPOS ? $item =~ $REPOPATT_PATT : $item =~ $REPONAME_PATT) or $item =~ $USERNAME_PATT;
if ($item =~ /^@/) # nested group
{
die "$ABRT undefined group $item\n" unless $groups{$item};
@@ -198,6 +196,7 @@ sub parse_conf_file
@repos = keys %repos;
} else {
@repos = expand_list ( @repos );
+ do { die "$ABRT bad reponame $_\n" unless ($GL_WILDREPOS ? $_ =~ $REPOPATT_PATT : $_ =~ $REPONAME_PATT) } for @repos;
}
s/\bCREAT[EO]R\b/\$creater/g for @repos;
}