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

fix a rather large typo/thinko in 1006eba

Browse source 
If you look at this change, and the same lines in 1006eba, you can
easily see what I missed...
This commit is contained in:
Sitaram Chamarty 2011-09-10 18:57:42 +05:30
parent fcb41f06f0
commit 63f18a5adf
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl-compile-conf
View file

@ -268,7 +268,7 @@ sub parse_conf_line
# substitute HOSTNAME word if GL_HOSTNAME defined, otherwise leave as is # substitute HOSTNAME word if GL_HOSTNAME defined, otherwise leave as is
$include_glob =~ s/\bHOSTNAME\b/$GL_HOSTNAME/ if $GL_HOSTNAME; $include_glob =~ s/\bHOSTNAME\b/$GL_HOSTNAME/ if $GL_HOSTNAME;
for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) { for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
warn("$WARN included file not found: '$file'\n"), next unless -f $file; warn("$WARN included file not found: '$file'\n"), next unless -f $file;
my $file_id = device_inode($file); my $file_id = device_inode($file);

12
t/t68-include
View file

@ -37,9 +37,9 @@ echo "
include \"*.conf\" include \"*.conf\"
" | ugc " | ugc
expect "remote: conf/gitolite.conf already included" expect "remote: .*/conf/gitolite.conf already included"
notexpect "remote: conf/i1.conf already included" notexpect "remote: .*/conf/i1.conf already included"
notexpect "remote: conf/i2.conf already included" notexpect "remote: .*/conf/i2.conf already included"
expect "remote: creating bar..." expect "remote: creating bar..."
expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/bar.git/" expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/bar.git/"
expect "remote: creating baz..." expect "remote: creating baz..."
@ -55,8 +55,8 @@ echo "
include \"i*.conf\" include \"i*.conf\"
" | ugc " | ugc
expect "remote: conf/gitolite.conf already included" expect "remote: .*/conf/gitolite.conf already included"
expect "remote: conf/i1.conf already included" expect "remote: .*/conf/i1.conf already included"
expect "remote: conf/i2.conf already included" expect "remote: .*/conf/i2.conf already included"
name INTERNAL name INTERNAL