Change unlink to remove_tree in ordre to clean git_manage_ temporary directories
This commit is contained in:
parent
9dbf492046
commit
ed0edaf9f3
1 changed files with 6 additions and 6 deletions
|
|
@ -5,7 +5,7 @@ package Git;
|
||||||
use v5.10.1;
|
use v5.10.1;
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
use File::Path;
|
use File::Path qw(remove_tree);
|
||||||
use File::Temp;
|
use File::Temp;
|
||||||
|
|
||||||
use ACU::LDAP;
|
use ACU::LDAP;
|
||||||
|
|
@ -31,7 +31,7 @@ sub init_conf(;$)
|
||||||
|
|
||||||
log INFO, "Cloning $git_user\@$git_server:$git_adminrepo to $gitolite_directory";
|
log INFO, "Cloning $git_user\@$git_server:$git_adminrepo to $gitolite_directory";
|
||||||
|
|
||||||
system ("git clone $git_user\@$git_server:$git_adminrepo $gitolite_directory");
|
qx(git clone $git_user\@$git_server:$git_adminrepo $gitolite_directory);
|
||||||
|
|
||||||
chdir($gitolite_directory);
|
chdir($gitolite_directory);
|
||||||
|
|
||||||
|
|
@ -43,12 +43,12 @@ sub save_conf(;$)
|
||||||
chdir($gitolite_directory);
|
chdir($gitolite_directory);
|
||||||
|
|
||||||
my $commit = shift;
|
my $commit = shift;
|
||||||
system ("git commit -am '$commit'") if ($commit);
|
qx(git commit -am '$commit') if ($commit);
|
||||||
|
|
||||||
log INFO, "Saving repositories configuration";
|
log INFO, "Saving repositories configuration";
|
||||||
|
|
||||||
system ("git push");
|
qx(git push);
|
||||||
unlink ($gitolite_directory);
|
remove_tree($gitolite_directory);
|
||||||
$gitolite_directory = undef;
|
$gitolite_directory = undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -235,7 +235,7 @@ sub user_add
|
||||||
print $kf $key;
|
print $kf $key;
|
||||||
close $kf;
|
close $kf;
|
||||||
|
|
||||||
system("git add $gitolite_directory/keydir/$i/$login.pub");
|
qx(git add $gitolite_directory/keydir/$i/$login.pub);
|
||||||
$i += 1;
|
$i += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Reference in a new issue