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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 117d83e66ca7d68acaef25b3bac1e27ce4a1bf79
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Apr 22 21:36:57 2010 +0200

    pass 'timeout' to search_bug, needed when filtering bugs; thanks to Matt Kraai for the report and patch; Closes: #578505

diff --git a/debian/changelog b/debian/changelog
index 53aaa09..1ba6005 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ reportbug (4.12+fixes) UNRELEASED; urgency=low
   * reportbug/utils.py
     - only take file name and md5sum from Conffile from dpkg --status; thanks to
       all the reporters; Closes: #577986
+  * reportbug/ui/text_ui.py
+    - pass 'timeout' to search_bug, needed when filtering bugs; thanks to Matt
+      Kraai for the report and patch; Closes: #578505
 
- -- Sandro Tosi <morph at debian.org>  Thu, 22 Apr 2010 19:30:32 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 22 Apr 2010 21:34:38 +0200
 
 reportbug (4.12) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index ae01b3f..4bfcda6 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -699,7 +699,7 @@ def browse_bugs(hierarchy, count, bugs, bts, queryonly, mirrors,
 		    elif x == 'f':
 			# Do filter. Recursive done.
 			retval = search_bugs(hierarchy,bts, queryonly, mirrors,
-                                             http_proxy, screen, title, package)
+                                             http_proxy, timeout, screen, title, package)
 			if retval in ["FilterEnd", "Top"]:
 			    continue
 			else:
@@ -768,7 +768,7 @@ def proc_hierarchy(hierarchy):
     return count, bugs
 
 def search_bugs(hierarchyfull, bts, queryonly, mirrors,
-                http_proxy, screen, title, package):
+                http_proxy, timeout, screen, title, package):
     """Search for the bug list using a pattern."""
     """Return string "FilterEnd" when we are done with search."""
 
@@ -905,7 +905,7 @@ def search_bugs(hierarchyfull, bts, queryonly, mirrors,
 		    elif x == 'f':
 			# Do filter. Recursive done.
 			retval = search_bugs(hierarchy, bts, queryonly, mirrors,
-			    http_proxy, screen, title, package)
+			    http_proxy, timeout, screen, title, package)
 			if retval == "FilterEnd":
 			    continue
 			else:

-- 
Reportbug - reports bugs in the Debian distribution