[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.4-2-g2af8e9f

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 2af8e9f35509b676ec02a6b990b2a690ec1d229d
Author: Sandro Tosi <morph at debian.org>
Date:   Tue May 26 01:22:38 2009 +0200

     force to enter the package name and short description while reporting a
        wnpp bug; thanks to Sam Morris for the report and to Carl Chenet for the
        idea about how to fix it; Closes: #456344

diff --git a/debian/changelog b/debian/changelog
index 39edfc5..4b279a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ reportbug (4.5) UNRELEASED; urgency=low
 
   * reportbug/__init__.py
     - bump reportbug version
+  * reportbug/debianbts.py
+    - force to enter the package name and short description while reporting a
+      wnpp bug; thanks to Sam Morris for the report and to Carl Chenet for the
+      idea about how to fix it; Closes: #456344
 
- -- Sandro Tosi <morph at debian.org>  Mon, 25 May 2009 22:24:50 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 26 May 2009 01:21:13 +0200
 
 reportbug (4.4) unstable; urgency=low
 
diff --git a/reportbug/debianbts.py b/reportbug/debianbts.py
index fa7bbb2..169e4c9 100644
--- a/reportbug/debianbts.py
+++ b/reportbug/debianbts.py
@@ -355,12 +355,15 @@ def handle_wnpp(package, bts, ui, fromaddr, online=True, http_proxy=None):
         ui.long_message('To report a bug in a package, use the name of the package, not wnpp.\n')
         raise SystemExit
 
-    if tag in ('RFP', 'ITP'):
-        prompt = 'Please enter the proposed package name: '
-    else:
-        prompt = 'Please enter the name of the package: '
-    package = ui.get_string(prompt)
-    if not package: return
+    # keep asking for package name until one is entered
+    package = ""
+
+    while not package:
+        if tag in ('RFP', 'ITP'):
+            prompt = 'Please enter the proposed package name: '
+        else:
+            prompt = 'Please enter the package name: '
+        package = ui.get_string(prompt)
 
     ui.log_message('Checking status database...\n')
     info = utils.get_package_status(package)
@@ -381,11 +384,13 @@ def handle_wnpp(package, bts, ui, fromaddr, online=True, http_proxy=None):
 
         severity = 'wishlist'
 
-        short_desc = ui.get_string(
-            'Please briefly describe this package; this should be an '
-            'appropriate short description for the eventual package: ')
-        if not short_desc:
-            return
+        # keep asking for short description until one is entered
+        short_desc = ""
+
+        while not short_desc:
+            short_desc = ui.get_string(
+                'Please briefly describe this package; this should be an '
+                'appropriate short description for the eventual package: ')
 
         if tag == 'ITP':
             headers.append('X-Debbugs-CC: debian-devel at lists.debian.org')

-- 
Reportbug - reports bugs in the Debian distribution