Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix restore not to die when conflicting custom columns are encountered.

Browse Source
This commit is contained in:
Charles Haley 2010-10-20 12:28:55 +01:00
parent d8fc285b70
commit abc1f7525c
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/library/restore.py
View File

@ -170,8 +170,8 @@ class Restore(Thread):
label = cfm['label'] label = cfm['label']
if label in m and args != m[label]: if label in m and args != m[label]:
if label not in self.conflicting_custom_cols: if label not in self.conflicting_custom_cols:
self.conflicting_custom_cols[label] = set([m[label]]) self.conflicting_custom_cols[label] = []
self.conflicting_custom_cols[label].add(args) self.conflicting_custom_cols[label].append(args)
m[cfm['label']] = args m[cfm['label']] = args
db = RestoreDatabase(self.library_path) db = RestoreDatabase(self.library_path)