Break out ensuredir and make mkrepotmp use it

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index a53cb822950d9df861ab80df8d0996145d444b2d..c2b7f670012ee2293ac57b72ce36b683f4c2c26f 100644 (file)
--- 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 f700df81ca1f507e711afff2bceea5097919f0ee..e794de25d152d4f421dc9064f1b58ce3670b3f68 100755 (executable)
--- 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) = @_;