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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 2e4725d2fd924d5776b03a7c181a09a02a136f2b
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Dec 16 00:10:28 2009 +0100

    if help option is selected in debconf values inclusion menu, the second message doesn't contain newline, it's fixed now; thanks to Miroslaw Zalewski for the report; Closes: #560302

diff --git a/debian/changelog b/debian/changelog
index 59979ab..ddf40ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,12 @@ reportbug (4.10~WIP) UNRELEASED; urgency=low
   * bin/querybts
     - use optparse instead of getopt to parse CLI options and arguments;
       Closes: #559677
+  * reportbug/ui/text_ui.py
+    - if help option is selected in debconf values inclusion menu, the second
+      message doesn't contain newline, it's fixed now; thanks to Miroslaw
+      Zalewski for the report; Closes: #560302
 
- -- Sandro Tosi <morph at debian.org>  Tue, 15 Dec 2009 22:37:29 +0100
+ -- Sandro Tosi <morph at debian.org>  Wed, 16 Dec 2009 00:07:14 +0100
 
 reportbug (4.9) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index cf3fad1..eb52ee7 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -193,7 +193,7 @@ def select_options(msg, ok, help, allow_numbers=None, nowrap=False):
             desc += help.get(ch, help.get(ch.lower(),
                                           'No help for this option.'))
             ewrite(indent_wrap_text(desc+'\n', '%s - '% ch, 4))
-        return select_options(msg, ok, help, allow_numbers)
+        return select_options(msg, ok, help, allow_numbers, nowrap)
     elif (ch.lower() in ok) or (ch.upper() in ok):
         return ch.lower()
     elif err_message:

-- 
Reportbug - reports bugs in the Debian distribution