From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Aug 2013 15:13:36 +0000 (+0100)
Subject: Better error message for use of UNRELEASED suite.  Closes: #720523.
X-Git-Tag: debian/0.11~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a17b1a3b36a31ac8def26e0a5aeca865873c9374

Better error message for use of UNRELEASED suite.  Closes: #720523.
---

diff --git a/debian/changelog b/debian/changelog
index 7261108e..58de63ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dgit (0.11) unstable; urgency=low
   * Use "ftp.debian.org" not "http.debian.net" as the default Debian
     archive.  (http.debian.net tends to defeat certain kinds of cacheing,
     and can also have more skew.)
+  * Better error message for use of UNRELEASED suite.  Closes: #720523.
+  * Do not canonicalise suite more than once.  Related to: #720526.
 
  --
 
diff --git a/dgit b/dgit
index 77a9bb60..55c2b243 100755
--- a/dgit
+++ b/dgit
@@ -415,6 +415,8 @@ sub canonicalise_suite_madison ($$) {
 }
 
 sub canonicalise_suite () {
+    return if defined $csuite;
+    fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
     $csuite = archive_query('canonicalise_suite');
     if ($isuite ne $csuite) {
 	# madison canonicalises for us