Merge ~alexmurray/ubuntu-security-tools:dont-recommend-proposed into ubuntu-security-tools:master

[Alex Murray]

Whilst it used to be the process to use foo-proposed as the suite when doing SRU type uploads, this was too confusing for users to see foo-proposed in changelogs when they didn't have -proposed enabled as an apt source, so instead now maintainer uploads should just use foo (ie the release pocket) not proposed.

[Marc Deslauriers (mdeslaur)]

LGTM, ACK.

review: Approve

diff --git a/package-tools/check-source-package b/package-tools/check-source-package
index 3cd8d47..195a87d 100755
--- a/package-tools/check-source-package
+++ b/package-tools/check-source-package
@@ -536,9 +536,14 @@ check_pocket() {
             failed "FAIL: does not have '${pocket}' pocket"
         fi
     elif [ "$dist" != "unstable" ] && [ "$dist" != "$devel" ]; then
-        # make sure -proposed is there for non-security uploads for released
-        # versions
-        if echo "$dist" | grep -E -q "[a-z]+-proposed$" || echo "$dist" | grep -E -q "[a-z]+-backports$" ; then
+        # make sure -proposed is NOT there for non-security uploads for
+        # released versions (in the past -proposed was used but this
+        # resulted in confusing changelogs that would specify -proposed
+        # even though users did not have -proposed enabled so make sure it
+        # is not used)
+        if echo "$dist" | grep -E -q "[a-z]+-proposed$" ; then
+            failed "FAIL: pocket is 'proposed'"
+        elif echo "$dist" | grep -E -q "[a-z]+-backports$" ; then
             echo "pass"
         else
             pocket="updates"
@@ -547,7 +552,7 @@ check_pocket() {
             elif [ "$srcpkg_is_partner" = "yes" ]; then
                 echo "pass (partner)"
             else
-                failed "FAIL: pocket is not 'proposed' or 'backports'"
+                failed "FAIL: pocket is not release (ie. empty), 'updates' or 'backports'"
             fi
         fi
     else