chiark / gitweb /
Split brain: Run dpkg-source --before-build separately (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 10:40:06 +0000 (11:40 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:46 +0000 (16:47 +0100)
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.

dgit

diff --git a/dgit b/dgit
index 299c531214cc5a50efd193bc29de9b7d7fea820f..5910c778f2f7d0798150cd2ac89aaa15171ccbfe 100755 (executable)
--- 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='';