From abc1f7525c8a2af18a714ee57944c720750b7ec7 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 20 Oct 2010 12:28:55 +0100
Subject: [PATCH] Fix restore not to die when conflicting custom columns are
 encountered.

---
 src/calibre/library/restore.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py
index 16aba3aebd..748d60b0b2 100644
--- a/src/calibre/library/restore.py
+++ b/src/calibre/library/restore.py
@@ -170,8 +170,8 @@ class Restore(Thread):
                     label = cfm['label']
                     if label in m and args != m[label]:
                         if label not in self.conflicting_custom_cols:
-                            self.conflicting_custom_cols[label] = set([m[label]])
-                        self.conflicting_custom_cols[label].add(args)
+                            self.conflicting_custom_cols[label] = []
+                        self.conflicting_custom_cols[label].append(args)
                     m[cfm['label']] = args
 
         db = RestoreDatabase(self.library_path)