equal
deleted
inserted
replaced
102 address=emailaddr) |
102 address=emailaddr) |
103 if entity.primary_email: |
103 if entity.primary_email: |
104 entity.set_relations(use_email=email) |
104 entity.set_relations(use_email=email) |
105 else: |
105 else: |
106 entity.set_relations(primary_email=email) |
106 entity.set_relations(primary_email=email) |
|
107 elif self.sourceuris: |
|
108 # pop from sourceuris anyway, else email may be removed by the |
|
109 # source once import is finished |
|
110 self.sourceuris.pop(str(userdict['dn'] + '@@' + emailaddr), None) |
107 # XXX else check use_email relation? |
111 # XXX else check use_email relation? |
108 |
112 |
109 @cached |
113 @cached |
110 def _get_group(self, name): |
114 def _get_group(self, name): |
111 return self._cw.execute('Any X WHERE X is CWGroup, X name %(name)s', |
115 return self._cw.execute('Any X WHERE X is CWGroup, X name %(name)s', |