chiark / gitweb /
dgit: Always canonicalise suite rather earlier
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 19:41:37 +0000 (20:41 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 19:43:43 +0000 (20:43 +0100)
dgit

diff --git a/dgit b/dgit
index 265978e..f8b4fdd 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 (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";
     }