From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 27 May 2015 20:24:04 +0000 (+0100)
Subject: Break out ensuredir and make mkrepotmp use it
X-Git-Tag: debian/0.30~139
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=991b8c9a6bba8aeec02cb1b3d39e3f9e8d941a29

Break out ensuredir and make mkrepotmp use it
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index a53cb822..c2b7f670 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,7 +16,7 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
-                      stat_exists fail waitstatusmsg failedcmd
+                      stat_exists fail ensuredir waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
                       git_rev_parse git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
@@ -128,6 +128,13 @@ sub fail {
     die $s;
 }
 
+sub ensuredir ($) {
+    my ($dir) = @_; # does not create parents
+    return if mkdir $dir;
+    return if $! == EEXIST;
+    die "mkdir $dir: $!";
+}
+
 our @signames = split / /, $Config{sig_name};
 
 sub waitstatusmsg () {
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index f700df81..e794de25 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -234,12 +234,9 @@ sub lockrealtree () {
     locksometree(realdestrepo);
 }
 
-sub mkrepotmp () {
-    my $tmpdir = "$dgitrepos/_tmp";
-    return if mkdir $tmpdir;
-    return if $! == EEXIST;
-    die $!;
-}
+sub mkrepotmp () { ensuredir "$dgitrepos/_tmp" };
+
+sub removedtagsfile () { "$dgitrepos/_removed-tags/$package"; }
 
 sub recorderror ($) {
     my ($why) = @_;