X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fgit-cache-proxy;h=b0c9502f8554b8f3f15345f784a624aa5dd6b10f;hp=2f38de1154be164d316d7fb06579a22841d521c1;hb=dfbd234c7f11ce1aaa49937f1313a8214505c735;hpb=eede02a315ee2d05bfada0e62f5a9746046d3492

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 2f38de1..b0c9502 100755
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -408,14 +408,23 @@ sub housekeeping () {
 	eval {
 	    foreach my $suffix (qw(tmp git)) {
 		my $dir = "${subdir}\\.$suffix";
+		my $tdir = "${subdir}\\.tmp";
+		if ($dir ne $tdir) {
+		    if (!rename $dir,$tdir) {
+			next if $! == ENOENT;
+			die "$dir: cannot rename to $tdir: $!\n";
+		    }
+		}
 		my $errs;
-		remove_tree($dir, { safe=>1, error=>\$errs });
-		if (stat $dir) {
+		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";
+		} elsif ($! != ENOENT) {
+		    die "$tdir: cannot stat after deletion: $!\n";
 		}
 	    }
 	};