diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-05 22:40:26 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-11 18:56:03 +0100 |
commit | 667a6e28ae4f2bc17b6dfb54a859ba197914c103 (patch) | |
tree | 8167e8f8d07029c696d3b49c993445b71703453f /dgit | |
parent | d47fb5aa53e92957244c8045f64b450214340c89 (diff) |
dgit: With gbp-build, provide gbp with patches-unapplied tree
We may still need to apply, and then unapply, the patches, so as to
clean the tree. But gbp itself expects a patches-unapplied tree.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -4073,16 +4073,15 @@ sub cmd_gbp_build { } build_prep(); } + maybe_unapply_patches_again(); if ($wantsrc < 2) { unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) { canonicalise_suite(); push @cmd, "--git-debian-branch=".lbranch(); } push @cmd, changesopts(); - maybe_apply_patches_dirtily(); runcmd_ordryrun_local @cmd, @ARGV; } - maybe_unapply_patches_again(); printdone "build successful\n"; } sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0 |