From 8e3a97ee058cdfd1d9318fff2e9dcea9c78bb98d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 Oct 2016 19:44:43 +0000 Subject: [PATCH] dgit: Introduce build_prep_early Currently only one call site which is only ever called once. We make it idempotent since we're going to want that. No functional change. Signed-off-by: Ian Jackson --- dgit | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index af62eb50..ca907f3f 100755 --- a/dgit +++ b/dgit @@ -4963,15 +4963,21 @@ sub cmd_clean () { maybe_unapply_patches_again(); } -sub build_prep () { +sub build_prep_early () { + our $build_prep_early_done //= 0; + return if $build_prep_early_done++; notpushing(); badusage "-p is not allowed when building" if defined $package; - check_not_dirty(); - clean_tree(); my $clogp = parsechangelog(); $isuite = getfield $clogp, 'Distribution'; $package = getfield $clogp, 'Source'; $version = getfield $clogp, 'Version'; + check_not_dirty(); +} + +sub build_prep () { + build_prep_early(); + clean_tree(); build_maybe_quilt_fixup(); if ($rmchanges) { my $pat = changespat $version; -- 2.30.2