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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit ad03768811d13373aa67ec48fccc0f9a3606a550
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Sep 10 22:55:39 2011 +0200

    fix a crash after the bugs list, when filtering the result set, viewing a report and then wanting to follow it up; thanks to Michal Suchanek for the report; Closes: #640518
    
    The problem is that search_bugs() can return either a string or a Bugreport
    instance, so we need to check the return value type.

diff --git a/debian/changelog b/debian/changelog
index 3783420..55ac59a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ reportbug (6.3) UNRELEASED; urgency=low
   * reportbug/ui/text_ui.py
     - fix a crash after the bugs list, when selecting 'y' and then entering the
       item number; thanks to Jakub Wilki for the report; Closes: #640196
+    - fix a crash after the bugs list, when filtering the result set, viewing a
+      report and then wanting to follow it up; thanks to Michal Suchanek for the
+      report; Closes: #640518
 
- -- Sandro Tosi <morph at debian.org>  Sat, 10 Sep 2011 22:49:51 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 10 Sep 2011 22:54:04 +0200
 
 reportbug (6.2) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index 35c34b8..65570bd 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -704,7 +704,8 @@ def browse_bugs(hierarchy, count, bugs, bts, queryonly, mirrors,
 			retval = search_bugs(hierarchy,bts, queryonly, mirrors,
                                              http_proxy, timeout, screen, title,
                                              package, mbox_reader_cmd)
-			if retval in ["FilterEnd", "Top"]:
+			if isinstance(retval, basestring) and \
+                                retval in ["FilterEnd", "Top"]:
 			    continue
 			else:
 			    return retval

-- 
Reportbug - reports bugs in the Debian distribution