From 79964a37f8c4566762ffcf447f5404dd777cf114 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 28 Jul 2014 15:50:59 +0100 Subject: [PATCH] git-cache-proxy: housekeeping: use rm -rf, not remove_tree (which is weirdly broken) --- scripts/git-cache-proxy | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy index 9720a69..438dbf5 100755 --- 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"; } -- 2.30.2