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

(minor) support saying 'repo.git' in the config file

Browse source 
but complain loudly so they stop doing this... :-)
This commit is contained in:
Sitaram Chamarty 2010-11-10 18:07:58 +05:30
parent 6eb8558e8d
commit 270e0b9157
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gl-compile-conf
View file

@ -189,6 +189,7 @@ sub parse_conf_line
@{ $repos_p } = expand_list ( @{ $repos_p } ) unless $GL_BIG_CONFIG; @{ $repos_p } = expand_list ( @{ $repos_p } ) unless $GL_BIG_CONFIG;
# ...sanity check # ...sanity check
for (@{ $repos_p }) { for (@{ $repos_p }) {
warn "$WARN explicit '.git' extension ignored for $_.git\n" if s/\.git$//;
die "$ABRT bad reponame $_\n" die "$ABRT bad reponame $_\n"
if ($GL_WILDREPOS and $_ !~ $REPOPATT_PATT); if ($GL_WILDREPOS and $_ !~ $REPOPATT_PATT);
die "$ABRT bad reponame $_ or you forgot to set \$GL_WILDREPOS\n" die "$ABRT bad reponame $_ or you forgot to set \$GL_WILDREPOS\n"
@ -299,7 +300,7 @@ sub parse_conf_line
{ {
my $file = $1; my $file = $1;
$file = "$GL_ADMINDIR/conf/$file" unless $file =~ /^\//; $file = "$GL_ADMINDIR/conf/$file" unless $file =~ /^\//;
die "$WARN $fragment attempting to include configuration\n" if $fragment ne 'master'; die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
die "$ABRT included file not found: '$file'\n" unless -f $file; die "$ABRT included file not found: '$file'\n" unless -f $file;
parse_conf_file( $file, $fragment ); parse_conf_file( $file, $fragment );
@ -311,7 +312,7 @@ sub parse_conf_line
{ {
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 check_fragment_repo_disallowed( $fragment, $repo ); die "$ABRT $fragment attempting to set description for $repo\n" if check_fragment_repo_disallowed( $fragment, $repo );
$desc{"$repo.git"} = $desc; $desc{"$repo.git"} = $desc;
$owner{"$repo.git"} = $owner || ''; $owner{"$repo.git"} = $owner || '';
} }