Catch more IdentConflicts

pimutils · Sep 18, 2015 · e303c90 · e303c90
1 parent 21fb9f4
commit e303c90
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py
@@ -95,6 +95,12 @@ def prepare_idents(self, other_read_only):
         prefetch = {}
         self.idents = {}
 
+        def _store_props(ident, props):
+            if self.idents.setdefault(ident, props) is not props:
+                raise IdentConflict(storage=self.storage,
+                                    hrefs=[self.idents[ident]['href'],
+                                           href])
+
         for href, etag in self.storage.list():
             props = {'href': href, 'etag': etag}
             ident, old_etag = href_to_status.get(href, (None, None))
@@ -104,7 +110,7 @@ def prepare_idents(self, other_read_only):
                 # In both cases we should prefetch
                 prefetch[href] = props
             else:
-                self.idents[ident] = props
+                _store_props(ident, props)
 
         # Prefetch items
         for href, item, etag in (self.storage.get_multi(prefetch)
@@ -120,11 +126,7 @@ def prepare_idents(self, other_read_only):
                 )
             props['item'] = item
             props['ident'] = ident = item.ident
-
-            if self.idents.setdefault(ident, props) is not props:
-                raise IdentConflict(storage=self.storage,
-                                    hrefs=[self.idents[ident]['href'],
-                                           href])
+            _store_props(ident, props)
 
     def is_changed(self, ident):
         _, status_etag = self.status.get(ident, (None, None))