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

change die to warn if split_conf is not set but gl-conf is present

Browse source 
(although the opposite case is still a "die")

We found out how this can happen: if you change

    repo r1 r2

to

    @g = r1 r2
    repo @g

as found by t/deleg-2.t, which suddenly started breaking after an
apparently unrelated commit :-)
This commit is contained in:
Sitaram Chamarty 2012-03-19 14:31:21 +05:30
parent b1a75b7889
commit 3e1746b267
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Gitolite/Conf/Load.pm
View file

@ -195,7 +195,7 @@ sub load_1 {
}
if ( -f "gl-conf" ) {
_die "split conf not set, gl-conf present for $repo" if not $split_conf{$repo};
_warn "split conf not set, gl-conf present for $repo" if not $split_conf{$repo};
my $cc = "gl-conf";
_die "parse $cc failed: " . ( $! or $@ ) unless do $cc;