[commits] (vajda) [11272] let the mergeFn optionally delete the item too

[commits]

Title: [commits] (vajda) [11272] let the mergeFn optionally delete the item too

Revision

11272

Author

vajda

Date

2006-07-27 09:53:53 -0700 (Thu, 27 Jul 2006)

Log Message

let the mergeFn optionally delete the item too

Modified Paths

• trunk/chandler/repository/persistence/DBRepositoryView.py

Diff

Modified: trunk/chandler/repository/persistence/DBRepositoryView.py (11271 => 11272)

--- trunk/chandler/repository/persistence/DBRepositoryView.py	2006-07-27 16:25:49 UTC (rev 11271)
+++ trunk/chandler/repository/persistence/DBRepositoryView.py	2006-07-27 16:53:53 UTC (rev 11272)
@@ -427,7 +427,8 @@
                         if (mergeFn is None or
                             not mergeFn(MergeError.DELETE, item, None, None)):
                             self._e_2_delete(item, newVersion)
-                        item.delete(True)
+                        if not item.isDeleted():
+                            item.delete(True)
                         scan = True
 
         oldVersion = self._version

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits