From 16f71298e0a7736a3833e44e4a9ebb356f919dc6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 21 Mar 2015 11:55:13 +0000
Subject: dgit-repos-server: Break out movetogarbage

---
 infra/dgit-repos-server | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'infra/dgit-repos-server')

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 734fd71..ed27c0e 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -213,6 +213,15 @@ sub mkrepo_fromtemplate ($) {
     !$r or die "create new repo $dir failed: $r $!";
 }
 
+sub movetogarbage () {
+    my $garbagerepo = "$dgitrepos/_tmp/${package}_garbage";
+    acquiretree($garbagerepo,1);
+    rmtree $garbagerepo;
+    rename $realdestrepo, $garbagerepo
+	or $! == ENOENT
+	or die "rename repo $realdestrepo to $garbagerepo: $!";
+}
+
 #----- git-receive-pack -----
 
 sub fixmissing__git_receive_pack () {
@@ -642,12 +651,7 @@ sub parseargsdispatch () {
 
     my ($policy, $pollock) = policyhook(FRESHREPO,'check-package',$package);
     if ($policy & FRESHREPO) {
-	my $garbagerepo = "$dgitrepos/_tmp/${package}_garbage";
-	acquiretree($garbagerepo,1);
-	rmtree $garbagerepo;
-	rename $realdestrepo, $garbagerepo
-	    or $! == ENOENT
-	    or die "rename repo $destrepo to $garbagerepo: $!";
+	movetogarbage;
     }
     close $pollock or die $!;
 
-- 
cgit v1.2.3