From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jul 2015 19:41:37 +0000 (+0100)
Subject: dgit: Always canonicalise suite rather earlier
X-Git-Tag: debian/0.30~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=75d9628d62edf12c3b57c8d7d1ca614f5cc0fb17

dgit: Always canonicalise suite rather earlier
---

diff --git a/dgit b/dgit
index 265978ea..f8b4fdda 100755
--- a/dgit
+++ b/dgit
@@ -1897,10 +1897,12 @@ sub cmd_push {
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
-    }
-    if (defined $specsuite && $specsuite ne $isuite) {
+    } else {
 	canonicalise_suite();
-	$csuite eq $specsuite or
+    }
+    if (defined $specsuite &&
+	$specsuite ne $isuite &&
+	$specsuite ne $csuite) {
 	    fail "dgit push: changelog specifies $isuite ($csuite)".
 	        " but command line specifies $specsuite";
     }