conduit r1741 - in trunk: . conduit/modules/EvolutionModule

[jstowers svn gnome org]

Author: jstowers
Date: Sun Oct  5 13:19:23 2008
New Revision: 1741
URL: http://svn.gnome.org/viewvc/conduit?rev=1741&view=rev

Log:
2008-09-26  Matt Colyer <matt colyer name>

	* conduit/modules/EvolutionModule/EvolutionModule.py: Fix arguments
	on SynchronizeError.



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/EvolutionModule/EvolutionModule.py

Modified: trunk/conduit/modules/EvolutionModule/EvolutionModule.py
==============================================================================
--- trunk/conduit/modules/EvolutionModule/EvolutionModule.py	(original)
+++ trunk/conduit/modules/EvolutionModule/EvolutionModule.py	Sun Oct  5 13:19:23 2008
@@ -75,7 +75,7 @@
                     comp = obj.compare(existing)
                     # only update if newer
                     if comp != conduit.datatypes.COMPARISON_NEWER:
-                        raise Exceptions.SynchronizeConflictError(comp, existing, obj)
+                        raise Exceptions.SynchronizeConflictError(comp, obj, existing)
                     else:
                         # overwrite and return new ID
                         rid = self._update_object(LUID, obj)