[Reportbug-commits] [reportbug] 02/12: dont crash when selecting "Providing additional information" after filtering the bugs list more than once; Closes: #804130

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit 60024b2e0c28d538b95db8295f5aba6eac96ff85
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Dec 31 13:23:23 2015 +0000

    dont crash when selecting "Providing additional information" after filtering the bugs list more than once; Closes: #804130
---
 debian/changelog        | 5 ++++-
 reportbug/ui/text_ui.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f98ec43..d5f3d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,11 @@ reportbug (6.6.6) UNRELEASED; urgency=medium
       Closes: #546914
   * debian/control
     - add dep on 'file' for python-reportbug; Closes: #803764
+  * reportbug/ui/text_ui.py
+    - dont crash when selecting "Providing additional information" after
+      filtering the bugs list more than once; Closes: #804130
 
- -- Sandro Tosi <morph at debian.org>  Thu, 31 Dec 2015 12:55:54 +0000
+ -- Sandro Tosi <morph at debian.org>  Thu, 31 Dec 2015 13:22:18 +0000
 
 reportbug (6.6.5) unstable; urgency=medium
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index 66851c9..6a8241e 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -946,7 +946,7 @@ def search_bugs(hierarchyfull, bts, queryonly, mirrors,
                         # Do filter. Recursive done.
                         retval = search_bugs(hierarchy, bts, queryonly, mirrors, http_proxy, timeout, screen,
                                              title, package, mbox_reader_cmd)
-                        if retval == "FilterEnd":
+                        if isinstance(retval, basestring) and retval in ["FilterEnd", "Top"]:
                             continue
                         else:
                             return retval

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git