From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 28 Jul 2014 14:22:37 +0000 (+0100)
Subject: git-cache-proxy: housekeeping: Rename main dir to tmp before deleting to preserve... 
X-Git-Tag: debian/4.3.1~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=0551f3103af1b31e4cf03bd81c191f34837ef7d1;p=chiark-utils.git

git-cache-proxy: housekeeping: Rename main dir to tmp before deleting to preserve invariant
---

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 2f38de1..0c6ba55 100755
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -408,9 +408,16 @@ 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";