Commit 955c9cf9 authored by Sebastien Robin's avatar Sebastien Robin

don't send a mail to seb@localhost any more


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@380 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f91c2114
...@@ -124,7 +124,7 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -124,7 +124,7 @@ class XMLSyncUtilsMixin(SyncCode):
#server.set_debuglevel(1) #server.set_debuglevel(1)
server.sendmail(fromaddr, toaddr, msg) server.sendmail(fromaddr, toaddr, msg)
# if we want to send the email to someone else (debugging) # if we want to send the email to someone else (debugging)
server.sendmail(fromaddr, "seb@localhost", msg) #server.sendmail(fromaddr, "seb@localhost", msg)
server.quit() server.quit()
def addXMLObject(self, cmd_id=0, object=None, xml_string=None, def addXMLObject(self, cmd_id=0, object=None, xml_string=None,
...@@ -676,7 +676,7 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -676,7 +676,7 @@ class XMLSyncUtilsMixin(SyncCode):
# Objects to remove # Objects to remove
#for object_id in id_list: #for object_id in id_list:
for object_gid in subscriber.getGidList(): for object_gid in subscriber.getGidList():
if not (object_gid in local_gid_list): # @@@@@ if not (object_gid in local_gid_list):
# This is an object to remove # This is an object to remove
signature = subscriber.getSignature(object_gid) signature = subscriber.getSignature(object_gid)
if signature.getStatus()!=self.PARTIAL: # If partial, then we have a signature if signature.getStatus()!=self.PARTIAL: # If partial, then we have a signature
...@@ -734,11 +734,7 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -734,11 +734,7 @@ class XMLSyncUtilsMixin(SyncCode):
conflict_list += conduit.addNode(xml=data_subnode, object=destination_path, conflict_list += conduit.addNode(xml=data_subnode, object=destination_path,
object_id=object_id) object_id=object_id)
object = domain.getObjectFromGid(object_gid) object = domain.getObjectFromGid(object_gid)
LOG('applyActionList',0,'object after add: %s' % repr(object)) #LOG('SyncModif',0,'addNode, getActionId: %s' % self.getActionId(next_action)) LOG('applyActionList',0,'object after add: %s' % repr(object))
# try:
# object = destination_path._getOb(self.getActionId(next_action))
# except (AttributeError, KeyError):
# pass
if object is not None: if object is not None:
LOG('SyncModif',0,'addNode, found the object') LOG('SyncModif',0,'addNode, found the object')
mapping = getattr(object,domain.getXMLMapping(),None) mapping = getattr(object,domain.getXMLMapping(),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