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

minor fixups to the "gitweb/daemon from setperms" code...

Browse source 
- fork was not printing a newline after the permissions
  - "add_del_line" to properly handle that damn projects.list file!
This commit is contained in:
Sitaram Chamarty 2010-08-20 22:47:34 +05:30
parent 870983086c
commit 3a8f32ac9b
5 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/gitolite.pm
View file

@ -66,6 +66,26 @@ sub wrap_print {
close($fh);
}
sub add_del_line {
my ($line, $file, $flag) = @_;
my $contents;
local $/ = undef;
my $fh = wrap_open("<", $file);
$contents = <$fh>;
$contents =~ s/\s+$/\n/;
if ($flag and $contents !~ /^\Q$line\E$/m) {
# add line if it doesn't exist
$contents .= "$line\n";
wrap_print($file, $contents);
}
if (not $flag and $contents =~ /^\Q$line\E$/m) {
$contents =~ s/^\Q$line\E(\n|$)//m;
wrap_print($file, $contents);
}
}
sub dbg {
for my $i (@_) {
print STDERR "DBG: $i\n";
@ -279,7 +299,8 @@ sub get_set_perms
# gitweb and daemon
setup_daemon_access($repo);
system("echo $repo.git >> $PROJECTS_LIST") if &setup_gitweb_access($repo, '', '');
# add or delete line (arg1) from file (arg2) depending on arg3
&add_del_line ("$repo.git", $PROJECTS_LIST, &setup_gitweb_access($repo, '', ''));
}
}