From 667a6e28ae4f2bc17b6dfb54a859ba197914c103 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 5 Sep 2016 22:40:26 +0100 Subject: [PATCH] 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 --- dgit | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dgit b/dgit index 7ccaec42..8a097da1 100755 --- a/dgit +++ b/dgit @@ -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 -- 2.30.2