[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-48-g975a10c

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 8f635f97d6f01f28d2becfd27a9b0258f9863d8a
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Sep 6 20:12:26 2011 +0200

    be more explicit that Ctrl+c on subject menu exit reportbug without sending any report; thanks to simon for the report; Closes: #640213

diff --git a/bin/reportbug b/bin/reportbug
index 859dbf2..8c960ae 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1865,7 +1865,8 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                     'allowed). This will be the bug email subject, so keep the '
                     'summary as concise as possible, for example: "fails to '
                     'send email" or "does not start with -q option specified" '
-                    '(enter Ctrl+c to exit).', force_prompt=True)
+                    '(enter Ctrl+c to exit reportbug without reporting a bug).',
+                    force_prompt=True)
 
                 if subject:
                     subject_ok = True
diff --git a/debian/changelog b/debian/changelog
index 79dd1a9..1eb58f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (6.3) UNRELEASED; urgency=low
+
+  * bin/reportbug
+    - be more explicit that Ctrl+c on subject menu exit reportbug without
+      sending any report; thanks to simon for the report; Closes: #640213
+
+ -- Sandro Tosi <morph at debian.org>  Tue, 06 Sep 2011 20:10:58 +0200
+
 reportbug (6.2) unstable; urgency=low
 
   * reportbug/debbugs.py

-- 
Reportbug - reports bugs in the Debian distribution