Merge lp:~cbhaley/calibre/calibre_dev into lp:calibre

[Charles Haley]

Make searches ignore exceptions when using the limit_search option. Fixes problem referred to in http://www.mobileread.com/forums/showthread.php?t=130548

[lp:~cbhaley/calibre/calibre_dev]

8999. By Kovid Goyal on 2011-04-23

...

=== modified file 'src/calibre/library/caches.py'
--- src/calibre/library/caches.py	2011-04-23 12:02:20 +0000
+++ src/calibre/library/caches.py	2011-04-23 20:27:27 +0000
@@ -630,8 +630,11 @@
                         terms.add(l)
                 if terms:
                     for l in terms:
-                        matches |= self.get_matches(l, query,
-                            candidates=candidates, allow_recursion=allow_recursion)
+                        try:
+                            matches |= self.get_matches(l, query,
+                                candidates=candidates, allow_recursion=allow_recursion)
+                        except:
+                            pass
                     return matches
 
             if location in self.field_metadata: