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

make VERSION work in both types of setups

Browse source 
The old install method will now use conf/VERSION instead of src/VERSION everywhere.

The new one, if you use the builtin make file to "make branch.tar" will also create just such a file
This commit is contained in:
Sitaram Chamarty 2010-02-10 12:35:01 +05:30 • committed by Sitaram Chamarty
parent e11f9521fe
commit 06d8ab4c18
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gitolite.pm
View file

@ -34,7 +34,7 @@ our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$); # very simple patter
our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
# these come from the RC file
our ($REPO_UMASK, $GL_WILDREPOS);
our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF);
our %repos;
# ----------------------------------------------------------------------------
@ -282,7 +282,7 @@ sub report_basic
# send back some useful info if no command was given
print "hello $user, the gitolite version here is ";
system("cat", "$GL_ADMINDIR/src/VERSION");
system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION");
print "\ryou have the following permissions:\n\r";
for my $r (sort keys %repos) {
my $perm .= ( $repos{$r}{C}{'@all'} ? ' @' : ( $repos{$r}{C}{$user} ? ' C' : ' ' ) );