chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
761b7bb
)
git-cache-proxy: housekeeping: use rm -rf, not remove_tree (which is weirdly broken)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 28 Jul 2014 14:50:59 +0000
(15:50 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 28 Jul 2014 14:50:59 +0000
(15:50 +0100)
scripts/git-cache-proxy
patch
|
blob
|
history
diff --git
a/scripts/git-cache-proxy
b/scripts/git-cache-proxy
index 9720a699962f6fa00a050461d28cf269c38ee2a8..438dbf5f474ef3613275bcd47e34cd2f04e59e01 100755
(executable)
--- a/
scripts/git-cache-proxy
+++ b/
scripts/git-cache-proxy
@@
-415,14
+415,9
@@
sub housekeeping () {
die "$dir: cannot rename to $tdir: $!\n";
}
}
- my $errs;
- remove_tree($tdir, { safe=>1, error=>\$errs });
- if (!stat $tdir) {
- foreach my $err (@$errs) {
- my ($file, $message) = %$err;
- logm 'info', "problem deleting: $file: $message";
- }
- die "$dir: problem deleting file(s)\n";
+ system qw(rm -rf --), $tdir;
+ if (stat $tdir) {
+ die "$dir: problem deleting file(s), rm exited $?\n";
} elsif ($! != ENOENT) {
die "$tdir: cannot stat after deletion: $!\n";
}