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

diff --git a/debian/changelog b/debian/changelog
index 7261108e7028e954c0acce5f42fad6586e138820..58de63aebdf6401026059f9520b72083291541a4 100644 (file)
--- 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 77a9bb6025306fda3d3661a82460c73542669d89..55c2b243d3b6dfa1d11909d3242acf533883028c 100755 (executable)
--- 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