summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 11:40:06 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:46 +0100
commitfbb665eaf5e2ca9d027128dd8838adc15c934b30 (patch)
tree51fb40233a40d7f4e819ffaaf7adc73c31cc09df
parent30dfa155fe762380e2188a4e4c18e6beb5ea713e (diff)
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.
-rwxr-xr-xdgit8
1 files changed, 7 insertions, 1 deletions
diff --git a/dgit b/dgit
index 299c531..5910c77 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='';