Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

When trying to upgrade a shared lock a LockingError is raised not a DowngradeError

Browse Source
This commit is contained in:
Kovid Goyal 2021-05-05 21:52:13 +05:30
parent d8918f1dd8
commit 1f50076bb8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/db/cache.py
View File

@ -28,7 +28,7 @@ from calibre.db.categories import get_categories
from calibre.db.errors import NoSuchBook, NoSuchFormat from calibre.db.errors import NoSuchBook, NoSuchFormat
from calibre.db.fields import IDENTITY, InvalidLinkTable, create_field from calibre.db.fields import IDENTITY, InvalidLinkTable, create_field
from calibre.db.lazy import FormatMetadata, FormatsList, ProxyMetadata from calibre.db.lazy import FormatMetadata, FormatsList, ProxyMetadata
from calibre.db.locking import DowngradeLockError, SafeReadLock, create_locks from calibre.db.locking import LockingError, DowngradeLockError, SafeReadLock, create_locks
from calibre.db.search import Search from calibre.db.search import Search
from calibre.db.tables import VirtualTable from calibre.db.tables import VirtualTable
from calibre.db.utils import type_safe_sort_key_function from calibre.db.utils import type_safe_sort_key_function
@ -688,7 +688,7 @@ class Cache(object):
try: try:
with self.write_lock: with self.write_lock:
self.clear_composite_caches() self.clear_composite_caches()
except DowngradeLockError: except LockingError:
# We can't clear the composite caches because a read lock is set. # We can't clear the composite caches because a read lock is set.
# As a consequence the value of a composite column that calls # As a consequence the value of a composite column that calls
# virtual_libraries() might be wrong. Oh well. Log and keep running. # virtual_libraries() might be wrong. Oh well. Log and keep running.