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

Proposed by Charles Haley on 2011-04-23
Status: Merged
Merged at revision: 8999
Proposed branch: lp:~cbhaley/calibre/calibre_dev
Merge into: lp:calibre
Diff against target: 17 lines (+5/-2)
1 file modified
src/calibre/library/caches.py (+5/-2)
To merge this branch: bzr merge lp:~cbhaley/calibre/calibre_dev
Reviewer Review Type Date Requested Status
Kovid Goyal 2011-04-23 Pending
Review via email: mp+58881@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~cbhaley/calibre/calibre_dev updated on 2011-04-23
8999. By Kovid Goyal on 2011-04-23

...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/calibre/library/caches.py'
2--- src/calibre/library/caches.py 2011-04-23 12:02:20 +0000
3+++ src/calibre/library/caches.py 2011-04-23 20:27:27 +0000
4@@ -630,8 +630,11 @@
5 terms.add(l)
6 if terms:
7 for l in terms:
8- matches |= self.get_matches(l, query,
9- candidates=candidates, allow_recursion=allow_recursion)
10+ try:
11+ matches |= self.get_matches(l, query,
12+ candidates=candidates, allow_recursion=allow_recursion)
13+ except:
14+ pass
15 return matches
16
17 if location in self.field_metadata:

Subscribers

People subscribed via source and target branches