[Reportbug-commits] [reportbug] 01/04: extend release.d.o binNMUs handling to include a menu to request the suite the binNMU is for; thanks to Andreas Beckmann for the report and Niels Thykier, Adam D. Barratt from release team for help; Closes: #769355

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit 44f50f679b202fe21a95cf3b2500c3243956e04a
Author: Sandro Tosi <morph at debian.org>
Date:   Sat May 9 00:52:01 2015 -0400

    extend release.d.o binNMUs handling to include a menu to request the suite the binNMU is for; thanks to Andreas Beckmann for the report and Niels Thykier, Adam D. Barratt from release team for help; Closes: #769355
---
 debian/changelog     |  7 +++++--
 reportbug/debbugs.py | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c14456f..fbec6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-reportbug (6.6.4) UNRELEASED; urgency=medium
+ (6.6.4) UNRELEASED; urgency=medium
 
   * reportbug/debbugs.py
     - fix usage of singular they in RFH description; thanks to Doug Torrance for
@@ -8,6 +8,9 @@ reportbug (6.6.4) UNRELEASED; urgency=medium
     - clarify to not select any item in the suite menu for ftp.debian.org to
       choose 'unstable', that should work on every UI available; thanks to
       Rafael Laboissiere for the report; Closes: #765546
+    - extend release.d.o binNMUs handling to include a menu to request the suite
+      the binNMU is for; thanks to Andreas Beckmann for the report and Niels
+      Thykier, Adam D. Barratt from release team for help; Closes: #769355
   * share/script
     - report PAGER environment variable when filing a bug against reportbug
   * reportbug/ui/gtk2_ui.py
@@ -37,7 +40,7 @@ reportbug (6.6.4) UNRELEASED; urgency=medium
       the security team since it is (or not) an undisclosed vulnerability;
       Closes: #685829
 
- -- Sandro Tosi <morph at debian.org>  Sun, 03 May 2015 23:59:40 -0400
+ -- Sandro Tosi <morph at debian.org>  Sat, 09 May 2015 00:50:24 -0400
 
 reportbug (6.6.3) unstable; urgency=medium
 
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index a3f4169..3435fe9 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -481,6 +481,21 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
             if not archs:
                 ui.long_message('No architecture specified, skipping...')
 
+    if tag == 'binnmu':
+        suite = ui.menu("For which suite are you requesting this binNMU?"
+                        "  Don't select anything for \"unstable\"", {
+            'jessie' : "",
+            'jessie-backports' : "",
+            'jessie-security' : "",
+            'wheezy' : "",
+            'wheezy-backports' : "",
+            'wheezy-security' : "",
+            'stretch': "",
+            'experimental' : "",
+        }, 'Choose the suite: ', empty_ok=True)
+        if not suite:
+            suite = 'unstable'
+
     pseudos.append("User: release.debian.org at packages.debian.org")
     if tag.endswith('-pu'):
         pseudos.append("Usertags: pu")
@@ -491,7 +506,7 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
     if tag == 'binnmu':
         reason  = ui.get_string("binNMU changelog entry: ")
         subject = "nmu: %s_%s" % (package, version)
-        body    = "nmu %s_%s . %s . -m \"%s\"\n" % (package, version, archs or "ALL", reason)
+        body    = "nmu %s_%s . %s . %s . -m \"%s\"\n" % (package, version, archs or "ALL", suite, reason)
     elif tag == 'transition':
         subject = 'transition: %s' % (package)
         body    = '(please explain about the transition: impacted packages, reason, ...\n' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git