From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Jan 2017 15:34:06 +0000 (+0000)
Subject: dgit: buile_prep_early: Call notpushing() after getting $isuite
X-Git-Tag: archive/debian/3.1~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=470a6734ed3fb8ed87d76e7dc716963cfe232e6b;p=dgit.git

dgit: buile_prep_early: Call notpushing() after getting $isuite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 607b2cd5..27cda33d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (3.1~) unstable; urgency=medium
 
   Bugfixes:
   * dgit import-dsc: Do not crash with undefined $isuite.  Closes:#850781.
+  * dgit build: Do not sometimes crash with undefined $isuite.
   * dgit: Do not nedlessly re-fetch the rewrite map.
   * dgit: After downloading .debian.* files, save them in `..', too
     (ie do this not just for .origs).
diff --git a/dgit b/dgit
index a51c8782..a18d0181 100755
--- a/dgit
+++ b/dgit
@@ -5663,12 +5663,12 @@ sub cmd_clean () {
 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;
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    notpushing();
     check_not_dirty();
 }