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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 9a5e0be19f42fb386dc53758204894b17bcfa8b6
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Dec 26 12:11:20 2010 +0100

    commands.getoutput() strips tailing new line, so adding one to lsb_release_info; thanks to Yaroslav Halchenko for (partial) patch
    
    it's needed for the debianbts.*_infofunc methods using lsb_release_info():
    without the newline, it will attach the result of lsb_release to the next
    string, which is graphically ugly.

diff --git a/debian/changelog b/debian/changelog
index 5cf5a52..4535049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ reportbug (4.99.0) UNRELEASED; urgency=low
   * reportbug/debianbts.py, test/test_debianbts.py
     - fix os.uname() call in generic_infofunc() method, also adding unit tests
       for it; thanks to Yaroslav Halchenko for report and patch; Closes: #607849
+  * reportbug/utils.py
+    - commands.getoutput() strips tailing new line, so adding one to
+      lsb_release_info; thanks to Yaroslav Halchenko for (partial) patch
 
- -- Sandro Tosi <morph at debian.org>  Sun, 26 Dec 2010 11:39:13 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 26 Dec 2010 12:09:03 +0100
 
 reportbug (4.12.6) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 36bec20..8d6ee0d 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -718,7 +718,7 @@ def get_debian_release_info():
     return debinfo
 
 def lsb_release_info():
-    return commands.getoutput('lsb_release -a 2>/dev/null')
+    return commands.getoutput('lsb_release -a 2>/dev/null') + '\n'
 
 def get_arch():
     arch = commands.getoutput('COLUMNS=79 dpkg --print-installation-architecture 2>/dev/null')

-- 
Reportbug - reports bugs in the Debian distribution