equal
deleted
inserted
replaced
41 except KeyError: |
41 except KeyError: |
42 ldap_emailattr = None |
42 ldap_emailattr = None |
43 for userdict in source._search(self._cw, source.user_base_dn, |
43 for userdict in source._search(self._cw, source.user_base_dn, |
44 source.user_base_scope, searchstr): |
44 source.user_base_scope, searchstr): |
45 entity = self.extid2entity(userdict['dn'], 'CWUser', **userdict) |
45 entity = self.extid2entity(userdict['dn'], 'CWUser', **userdict) |
46 if not self.created_during_pull(entity): |
46 if entity is not None and not self.created_during_pull(entity): |
47 self.notify_updated(entity) |
47 self.notify_updated(entity) |
48 attrs = self.ldap2cwattrs(userdict) |
48 attrs = self.ldap2cwattrs(userdict) |
49 self.update_if_necessary(entity, attrs) |
49 self.update_if_necessary(entity, attrs) |
50 self._process_email(entity, userdict) |
50 self._process_email(entity, userdict) |
51 |
51 |