182 emailextid = (userdict['dn'] + '@@' + emailaddr).encode('ascii') |
182 emailextid = (userdict['dn'] + '@@' + emailaddr).encode('ascii') |
183 if not rset: |
183 if not rset: |
184 # not found, create it. first forge an external id |
184 # not found, create it. first forge an external id |
185 extuser.values.setdefault('use_email', []).append(emailextid) |
185 extuser.values.setdefault('use_email', []).append(emailextid) |
186 yield importer.ExtEntity('EmailAddress', emailextid, dict(address=[emailaddr])) |
186 yield importer.ExtEntity('EmailAddress', emailextid, dict(address=[emailaddr])) |
187 elif self.sourceuris: |
187 elif self.source_uris: |
188 # pop from sourceuris anyway, else email may be removed by the |
188 # pop from source_uris anyway, else email may be removed by the |
189 # source once import is finished |
189 # source once import is finished |
190 self.sourceuris.pop(emailextid, None) |
190 self.source_uris.pop(emailextid, None) |
191 # XXX else check use_email relation? |
191 # XXX else check use_email relation? |
192 |
192 |
193 def handle_deletion(self, config, cnx, myuris): |
193 def handle_deletion(self, config, cnx, myuris): |
194 if config['delete-entities']: |
194 if config['delete-entities']: |
195 super(DataFeedLDAPAdapter, self).handle_deletion(config, cnx, myuris) |
195 super(DataFeedLDAPAdapter, self).handle_deletion(config, cnx, myuris) |