Attachment 7839 Details for Bug 41756 – ucs2con_allow_recreation_for_visible_ucs_object.diff

[patch] ucs2con_allow_recreation_for_visible_ucs_object.diff

ucs2con_allow_recreation_for_visible_ucs_object.diff (text/plain), 1022 bytes, created by Arvid Requate on 2016-07-26 19:32:33 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2016-07-26 19:32:33 CEST

Size: 1022 bytes

patch

obsolete

>Index: modules/univention/s4connector/__init__.py
>===================================================================
>--- modules/univention/s4connector/__init__.py	(Revision 70207)
>+++ modules/univention/s4connector/__init__.py	(Arbeitskopie)
>@@ -729,8 +729,11 @@
> 			entryUUID = new.get('entryUUID', [None])[0]
> 			if entryUUID:
> 				if self.was_entryUUID_deleted(entryUUID):
>-					ud.debug(ud.LDAP, ud.PROCESS, "__sync_file_from_ucs: Object with entryUUID %s was already deleted. Don't re-create." % entryUUID)
>-					return True
>+					if self._get_entryUUID(dn) == entryUUID:
>+						ud.debug(ud.LDAP, ud.PROCESS, "__sync_file_from_ucs: Object with entryUUID %s has been removed before but became visible again." % entryUUID)
>+					else:
>+						ud.debug(ud.LDAP, ud.PROCESS, "__sync_file_from_ucs: Object with entryUUID %s has been removed before. Don't re-create." % entryUUID)
>+						return True
> 			else:
> 				ud.debug(ud.LDAP, ud.ERROR, "__sync_file_from_ucs: Object without entryUUID: %s", (dn,))
> 				return False

Actions: View | Diff

Attachments on bug 41756: 7839