From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 10:40:06 +0000 (+0100)
Subject: Split brain: Run dpkg-source --before-build separately (nfc)
X-Git-Tag: archive/debian/2.0~329
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fbb665eaf5e2ca9d027128dd8838adc15c934b30;ds=sidebyside

Split brain: Run dpkg-source --before-build separately (nfc)

We are going to want to capture the patches-unapplied state of the
tree as a git tree object.  So split out the patch application part of
the fake .dsc extraction.

No functional change as yet.
---

diff --git a/dgit b/dgit
index 299c5312..5910c778 100755
--- a/dgit
+++ b/dgit
@@ -2932,16 +2932,22 @@ END
     $dscaddfile->($debtar);
     close $fakedsc or die $!;
 
-    runcmd qw(sh -ec), 'exec dpkg-source --no-check -x fake.dsc >/dev/null';
+    runcmd qw(sh -ec),
+        'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
 
     my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
     rename $fakexdir, "fake" or die "$fakexdir $!";
 
     changedir 'fake';
 
+    ensuredir '.pc';
+
     remove_stray_gits();
     mktree_in_ud_here();
 
+    runcmd qw(sh -ec),
+        'exec dpkg-source --before-build . >/dev/null';
+
     changedir '..';
 
     my $origtree='';