diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2024-01-20 10:10:06 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2024-01-20 10:16:59 -0800 |
| commit | 22d8557152b81ec78f36e3ae71084541451158ac (patch) | |
| tree | 7984c4e40818dc5e0f8d7c1bfdb9ca47a69068ce | |
| parent | fix: ensure keydir exists before loading metadata (diff) | |
| download | gitolite-gentoo-22d8557152b81ec78f36e3ae71084541451158ac.tar.gz gitolite-gentoo-22d8557152b81ec78f36e3ae71084541451158ac.tar.bz2 gitolite-gentoo-22d8557152b81ec78f36e3ae71084541451158ac.zip | |
test: accept gentoo version tag
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rwxr-xr-x | install | 2 | ||||
| -rwxr-xr-x | t/info-json.t | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -74,7 +74,7 @@ for my $d ($ln, $to) { chdir($ENV{GL_BINDIR}); my $version = `git describe --tags --long --dirty=-dt 2>/dev/null`; -unless ($version =~ /^v\d/) { +unless ($version =~ /^v\d|^gitolite-gentoo/) { print STDERR "git describe failed; cannot deduce version number\n"; $version = "(unknown)"; } diff --git a/t/info-json.t b/t/info-json.t index 74fbdf4..0b1ce89 100755 --- a/t/info-json.t +++ b/t/info-json.t @@ -169,7 +169,7 @@ sub test_gs { my $glu = shift; my $res = ( $href->{GL_USER} eq $glu ? 1 : 'undef' ); try 'perl $_ = "' . $res . '"; /1/'; - $res = ( $href->{gitolite_version} =~ /^v3.[5-9]/ ? 1 : 'undef' ); + $res = ( $href->{gitolite_version} =~ /^v3.[5-9]|^gitolite-gentoo-3.[5-9]/ ? 1 : 'undef' ); try 'perl $_ = "' . $res . '"; /1/'; $res = ( $href->{git_version} =~ /^1.[6-9]|^2./ ? 1 : 'undef' ); try 'perl $_ = "' . $res . '"; /1/'; |