# HG changeset patch # User Sylvain Thénault # Date 1337070773 -7200 # Node ID 0ae27909e45b404a6e75a952d0fe8073512d62d1 # Parent 0ea4ccf1d9a61ccf01260ae05107ef071d255b93 [ldapfeed] properly mark email address as encountered during import to avoid deleting them diff -r 0ea4ccf1d9a6 -r 0ae27909e45b sobjects/ldapparser.py --- a/sobjects/ldapparser.py Fri May 11 10:14:51 2012 +0200 +++ b/sobjects/ldapparser.py Tue May 15 10:32:53 2012 +0200 @@ -104,6 +104,10 @@ entity.set_relations(use_email=email) else: entity.set_relations(primary_email=email) + elif self.sourceuris: + # pop from sourceuris anyway, else email may be removed by the + # source once import is finished + self.sourceuris.pop(str(userdict['dn'] + '@@' + emailaddr), None) # XXX else check use_email relation? @cached