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

Sandro Tosi morph at debian.org
Tue Aug 16 16:11:14 UTC 2011


The following commit has been merged in the master branch:
commit 5a7a511c6d1fd33f166a4b56b39a2226a7f3c7f2
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Aug 16 18:09:45 2011 +0200

    get_report(): add headers to the bug messages only if they are preset, fix a crash; thanks to Andrey Rahmatullin for the report; Closes: #637994

diff --git a/debian/changelog b/debian/changelog
index 83768de..852fbe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ reportbug (6.1) UNRELEASED; urgency=low
     - in ftp.d.o override menu, if section and priority are not changed, allow
       to send the bug anyhow, because it's the override file outdated; thanks to
       Niels Thykier for the report; Closes: #628769
+    - get_report(): add headers to the bug messages only if they are preset, fix
+      a crash; thanks to Andrey Rahmatullin for the report; Closes: #637994
   * Use debian-swirl.svg (copied from gnome-icon-theme to avoid the dep) in the
     desktop file; thanks to Sérgio Cipolla for the report; Closes: #632383
   * bin/reportbug
@@ -17,7 +19,7 @@ reportbug (6.1) UNRELEASED; urgency=low
       saves all the emails headers and attachment, not only the report body;
       thanks to Ian Zimmerman for the report; Closes: #626656
 
- -- Sandro Tosi <morph at debian.org>  Tue, 16 Aug 2011 17:21:57 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 16 Aug 2011 18:07:58 +0200
 
 reportbug (6.0) unstable; urgency=low
 
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index a74e9b7..62fa77f 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -1293,7 +1293,8 @@ def get_report(number, timeout, system='debian', mirrors=None,
             h = f.close()
             hdrs = []
             for i in ['Date', 'Subject', 'From']:
-                hdrs.append(i + ': ' + h.get(i))
+                if i in h:
+                    hdrs.append(i + ': ' + h.get(i))
             bodies.append('\n'.join(sorted(hdrs)) + '\n\n' + l['body'])
 
         # subject, in a more nice format

-- 
Reportbug - reports bugs in the Debian distribution



More information about the Reportbug-commits mailing list