[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-82-gcadcedb

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 09f9637fcbd7f0d5aca6598f5b3bb5efd1401a0b
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Mar 28 15:51:50 2010 +0200

    keep presenting the severity menu until one is selected (prevent a crash with urwid UI and Cancel button); thanks to Noah Slater for the report; Closes: #461908

diff --git a/bin/reportbug b/bin/reportbug
index a861e22..0418d8b 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1793,11 +1793,11 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                         for sev in ['critical', 'grave', 'serious', 'does-not-build']:
                             del severities[sev]
                     default = 'normal'
-
-                severity = ui.menu("How would you rate the severity of this "
-                                   "problem or report?", severities,
-                                   'Please select a severity level: ',
-                                   default=default, order=debianbts.SEVLIST)
+                while not severity or severity not in debianbts.SEVLIST:
+                    severity = ui.menu("How would you rate the severity of this "
+                                       "problem or report?", severities,
+                                       'Please select a severity level: ',
+                                       default=default, order=debianbts.SEVLIST)
 
             if rtype == 'gnats':
                 # Class of report
diff --git a/debian/changelog b/debian/changelog
index 2a17843..35b6352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ reportbug (4.12) UNRELEASED; urgency=low
     - removed the information that an empty subject would stop the report: it
       will continue until entered or Ctrl+c; thanks Torquil Macdonald Sørensen
       for the report; Closes: #575450
+    - keep presenting the severity menu until one is selected (prevent a crash
+      with urwid UI and Cancel button); thanks to Noah Slater for the report;
+      Closes: #461908
   * reportbug/submit.py
     - clarify that in case no acknowledge is received, then there was an error;
       thanks to mpapet for the report; Closes: #575418
@@ -15,7 +18,7 @@ reportbug (4.12) UNRELEASED; urgency=low
       class, needed to run querybts; thanks to Andrey Rahmatullin for the
       report; Closes: #565283
 
- -- Sandro Tosi <morph at debian.org>  Sun, 28 Mar 2010 15:16:05 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 28 Mar 2010 15:50:47 +0200
 
 reportbug (4.11) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution