Commit 1dcc2dbc authored by Nicolas Delaby's avatar Nicolas Delaby

exit loop

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15022 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9427e86d
...@@ -890,6 +890,8 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -890,6 +890,8 @@ class XMLSyncUtilsMixin(SyncCode):
syncml_data += self.addXMLObject(cmd_id=cmd_id, object=object, syncml_data += self.addXMLObject(cmd_id=cmd_id, object=object,
gid=gid, xml_string=xml_string, gid=gid, xml_string=xml_string,
more_data=more_data, media_type=subscriber.getMediaType()) more_data=more_data, media_type=subscriber.getMediaType())
else:
break
return (syncml_data,xml_confirmation,cmd_id) return (syncml_data,xml_confirmation,cmd_id)
def applyActionList(self, domain=None, subscriber=None,destination_path=None, def applyActionList(self, domain=None, subscriber=None,destination_path=None,
...@@ -1070,7 +1072,6 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -1070,7 +1072,6 @@ class XMLSyncUtilsMixin(SyncCode):
if conflict_list != [] and signature is not None: if conflict_list != [] and signature is not None:
# We had a conflict # We had a conflict
signature.setStatus(self.CONFLICT) signature.setStatus(self.CONFLICT)
return (xml_confirmation,has_next_action,cmd_id) return (xml_confirmation,has_next_action,cmd_id)
def applyStatusList(self, subscriber=None,remote_xml=None): def applyStatusList(self, subscriber=None,remote_xml=None):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment