dgit: Always canonicalise suite rather earlier

diff --git a/dgit b/dgit
index 265978ea53cd0841de791d9aae3e409110caf4ac..f8b4fddabf46a87e7ce4b210ef24f6f83800b964 100755 (executable)
--- 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 ($new_package) {
        local ($package) = $existing_package; # this is a hack
        canonicalise_suite();

-    }
-    if (defined $specsuite && $specsuite ne $isuite) {
+    } else {

        canonicalise_suite();
        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";
     }
            fail "dgit push: changelog specifies $isuite ($csuite)".
                " but command line specifies $specsuite";
     }