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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 62b9e5cee3e2ecca9890d15cd50da332230289cb
Author: Sandro Tosi <morph at debian.org>
Date:   Thu May 27 22:22:18 2010 +0200

    when configuring, show the complete text about SMTP host (part was hidden if using GTK+ UI); thanks to Elie De Brauwer for the report and patch; Closes: #583292

diff --git a/bin/reportbug b/bin/reportbug
index dda16d3..fbf9fab 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -580,11 +580,11 @@ def offer_configuration(options):
         opts = []
         if options.smtphost:
             opts += [options.smtphost]
-        ewrite('Please enter the name of your SMTP host.  Usually it\'s called '
+        smtphost = ui.get_string(
+            'Please enter the name of your SMTP host.  Usually it\'s called '
             'something like "mail.example.org" or "smtp.example.org". '
             'If you need to use a different port than default, use the '
-            '<host>:<port> alternative format.\n\n')
-        smtphost = ui.get_string(
+            '<host>:<port> alternative format.\n\n'
             'Just press ENTER if you don\'t have one or don\'t know.',
             options=opts, empty_ok=True, force_prompt=True)
         if smtphost:
diff --git a/debian/changelog b/debian/changelog
index 2f36eac..232ba1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ reportbug (4.12.3) UNRELEASED; urgency=low
   * reportbug/utils.py
     - convert the config file name to UTF-8, avoinding a crash; thanks to Anders
       Lagerås for the report and to Carl Chenet for the patch; Closes: #578085
+  * bin/reportbug
+    - when configuring, show the complete text about SMTP host (part was hidden
+      if using GTK+ UI); thanks to Elie De Brauwer for the report and patch;
+      Closes: #583292
 
- -- Sandro Tosi <morph at debian.org>  Fri, 21 May 2010 07:25:11 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 27 May 2010 22:20:51 +0200
 
 reportbug (4.12.2) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution