summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-04 20:41:37 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-04 20:43:43 +0100
commit75d9628d62edf12c3b57c8d7d1ca614f5cc0fb17 (patch)
tree5f690fc47666395028501baf4003f33762ca70f2 /dgit
parentb6e8a1eb90f89a9f6fd4da8addcd168dc1e0e3e0 (diff)
dgit: Always canonicalise suite rather earlier
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit8
1 files changed, 5 insertions, 3 deletions
diff --git a/dgit b/dgit
index 265978e..f8b4fdd 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";
}