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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 242861de72be401e16800512a7413645ed1e3fde
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Oct 31 03:53:01 2011 +0100

    fix a crash when willing to submit more information after having seen a report; thanks to Viet Nguyen for the report; Closes: #644815

diff --git a/debian/changelog b/debian/changelog
index 8dfa23c..6d388b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ reportbug (6.2.3) UNRELEASED; urgency=low
   * reportbug/ui/urwid_ui.py
     - is_mouse_event() is in urwid.util in urwid 1.0.0; thanks to Andrew O.
       Shadura for the report; Closes: #646943
+    - fix a crash when willing to submit more information after having seen a
+      report; thanks to Viet Nguyen for the report; Closes: #644815
 
- -- Sandro Tosi <morph at debian.org>  Sun, 30 Oct 2011 23:25:55 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 31 Oct 2011 03:45:41 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/reportbug/ui/urwid_ui.py b/reportbug/ui/urwid_ui.py
index 678ac26..91645ef 100644
--- a/reportbug/ui/urwid_ui.py
+++ b/reportbug/ui/urwid_ui.py
@@ -606,7 +606,8 @@ def handle_bts_query(package, bts, timeout, mirrors=None, http_proxy="",
                     if info == -1:
                         result = None
                     else:
-                        result = info
+                        # uniform to return Bugreport instance
+                        result = debbugs.get_report(info, timeout)[0]
                     break
                 else:
                     p = info
@@ -625,7 +626,9 @@ def handle_bts_query(package, bts, timeout, mirrors=None, http_proxy="",
         long_message('No record of this package found.', title=title)
         raise NoPackage
 
-    if result and result < 0:
+    # we didn't find a report; we access Bugreport thru debbugs,
+    # so to avoid and import of debianbts
+    if result and not isinstance(result, debbugs.debianbts.Bugreport):
         raise NoReport
 
     return result

-- 
Reportbug - reports bugs in the Debian distribution