From 63f18a5adfbfa1f62427f02e347a1e0942d4d615 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Sat, 10 Sep 2011 18:57:42 +0530 Subject: [PATCH] fix a rather large typo/thinko in 1006eba If you look at this change, and the same lines in 1006eba, you can easily see what I missed... --- src/gl-compile-conf | 2 +- t/t68-include | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gl-compile-conf b/src/gl-compile-conf index 4354d0b..2d4110f 100755 --- a/src/gl-compile-conf +++ b/src/gl-compile-conf @@ -268,7 +268,7 @@ sub parse_conf_line # substitute HOSTNAME word if GL_HOSTNAME defined, otherwise leave as is $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; my $file_id = device_inode($file); diff --git a/t/t68-include b/t/t68-include index f1be71d..f05cc4f 100644 --- a/t/t68-include +++ b/t/t68-include @@ -37,9 +37,9 @@ echo " include \"*.conf\" " | ugc -expect "remote: conf/gitolite.conf already included" -notexpect "remote: conf/i1.conf already included" -notexpect "remote: conf/i2.conf already included" +expect "remote: .*/conf/gitolite.conf already included" +notexpect "remote: .*/conf/i1.conf already included" +notexpect "remote: .*/conf/i2.conf already included" expect "remote: creating bar..." expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/bar.git/" expect "remote: creating baz..." @@ -55,8 +55,8 @@ echo " include \"i*.conf\" " | ugc -expect "remote: conf/gitolite.conf already included" -expect "remote: conf/i1.conf already included" -expect "remote: conf/i2.conf already included" +expect "remote: .*/conf/gitolite.conf already included" +expect "remote: .*/conf/i1.conf already included" +expect "remote: .*/conf/i2.conf already included" name INTERNAL