From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Oct 2018 10:12:51 +0000 (+0100)
Subject: dgit: Rorganise dpkg-source[-d] clean implementation
X-Git-Tag: archive/debian/8.0~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a7a444f863e150475b2ab7ccc33576f68e08c734;p=dgit.git

dgit: Rorganise dpkg-source[-d] clean implementation

This will make it easier to introduce new variants.

No functional change.

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

diff --git a/dgit b/dgit
index 9c1f3e51..4cbc378c 100755
--- a/dgit
+++ b/dgit
@@ -6202,12 +6202,12 @@ sub maybe_unapply_patches_again () {
 sub clean_tree () {
     # We always clean the tree ourselves, rather than leave it to the
     # builder (dpkg-source, or soemthing which calls dpkg-source).
-    if ($cleanmode eq 'dpkg-source') {
+    if ($cleanmode =~ m{^dpkg-source}) {
+	my @cmd = @dpkgbuildpackage;
+	push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
+	push @cmd, qw(-T clean);
 	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
-    } elsif ($cleanmode eq 'dpkg-source-d') {
-	maybe_apply_patches_dirtily();
-	runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
+	runcmd_ordryrun_local @cmd;
     } elsif ($cleanmode eq 'git') {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {