From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 May 2015 07:58:06 +0000 (+0100)
Subject: dgit-repos-server: Debug when we movetogarbage
X-Git-Tag: debian/0.30~177
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=89dfd17c9cd0a9c030083a5530ac816987431187

dgit-repos-server: Debug when we movetogarbage
---

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index ae30eeff..634f91ed 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -301,15 +301,21 @@ sub movetogarbage () {
     # purposes (and, I guess, recovery from mistakes).  This is either
     # $garbage or $garbage-old.
     if (stat_exists "$garbagerepo") {
+	printdebug "movetogarbage: rmtree $garbagerepo-tmp\n";
 	rmtree "$garbagerepo-tmp";
 	if (rename "$garbagerepo-old", "$garbagerepo-tmp") {
+	    printdebug "movetogarbage: $garbagerepo-old -> -tmp, rmtree\n";
 	    rmtree "$garbagerepo-tmp";
 	} else {
 	    die "$garbagerepo $!" unless $!==ENOENT;
+	    printdebug "movetogarbage: $garbagerepo-old -> -tmp\n";
 	}
+	printdebug "movetogarbage: $garbagerepo -> -old\n";
 	rename "$garbagerepo", "$garbagerepo-old" or die "$garbagerepo $!";
     }
-    rename realdestrepo, $garbagerepo
+    my $real = realdestrepo;
+    printdebug "movetogarbage: $real -> $garbagerepo\n";
+    rename $real, $garbagerepo
 	or $! == ENOENT
 	or die "$garbagerepo $!";
 }