[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.5-10-g057aa80

[Sandro Tosi]

The following commit has been merged in the master branch:
commit a1d5e6458340eff258912a71d53cf935834ecc3c
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jul 20 15:28:12 2009 +0200

    do not exit if no subject is entered, keep asking it; thanks Olaf van der Spek for the report and Carl Chenet for the patch: Closes: #537449

diff --git a/bin/reportbug b/bin/reportbug
index 5d13f61..cf11493 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1607,12 +1607,12 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                     'a moment; an empty response will stop reportbug).  This will '
             'be the bug email subject, so write a concise summary of what '
             'is wrong with the package, for example, "fails to send email" '
-            'or "does not start with -q option specified."', force_prompt=True)
+            'or "does not start with -q option specified" (enter Ctrl+c to exit).', force_prompt=True)
 
-                if not subject:
-                    ewrite("Providing a subject is mandatory.\n")
-                else:
+                if subject:
                     subject_ok = True
+                else:
+                    ewrite("Providing a subject is mandatory.\n")
 
         if len(subject) > 100 and prompted and mode < MODE_EXPERT:
             subject = ui.get_string(
diff --git a/debian/changelog b/debian/changelog
index 26aac8a..7f0b74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ reportbug (4.6) UNRELEASED; urgency=low
   * bin/reportbug
     - allow ENTER to exit from file detaching menu (and enforced file checking);
       thanks to Rodrigo Campos for report and (partial) patch; Closes: 535789
+    - do not exit if no subject is entered, keep asking it; thanks Olaf van der
+      Spek for the report and Carl Chenet for the patch: Closes: #537449
 
- -- Sandro Tosi <morph at debian.org>  Sat, 11 Jul 2009 09:17:36 +0200
+ -- Sandro Tosi <morph at debian.org>  Mon, 20 Jul 2009 15:27:00 +0200
 
 reportbug (4.5) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution