From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 16:31:56 +0000 (+0100)
Subject: dgit-repos-server: tag2upload: Use a bpd and clean up origs
X-Git-Tag: archive/debian/9.1~52
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=56dac689f66baa1d9e5c2e25dd2f5ef78fdb1db2;hp=5773b7ee8ee79f71bc6f46ceaa502803ea4b59c0;p=dgit.git

dgit-repos-server: tag2upload: Use a bpd and clean up origs

This prevents us keeping forever the junk from uploads, and it
prevents us reusing it too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index df0be6bf..828ab7a1 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -1112,7 +1112,11 @@ sub mode_tag2upload () {
     my $tagref = "refs/tags/$tagval";
 
     rmtree $work;
+    rmtree 'bpd';
     mkdir $work or die $!;
+    mkdir 'bpd' or die $!;
+    unlink <*.orig*>;
+    dif $! if <*.orig*>;
     changedir $work;
     runcmd qw(git init -q);
     runcmd qw(git remote add origin), $url;
@@ -1233,6 +1237,7 @@ END
     push @dgit, $ENV{DGIT_DRS_DGIT} // 'dgit';
     push @dgit, '-wn';
     push @dgit, "-p$package";
+    push @dgit, '--build-products-dir=../bpd';
 
     changedir "..";
     runcmd (@dgit, qw(setup-gitattributes));