View | Details | Raw Unified | Return to bug 50593
Collapse All | Expand All

(-)services/univention-s4-connector/modules/univention/s4connector/__init__.py (-4 / +11 lines)
 Lines 1167-1172   class ucs(object): Link Here 
1167
				ud.debug(ud.LDAP, ud.INFO, '__set_values: Skip: %s' % con_attribute)
1167
				ud.debug(ud.LDAP, ud.INFO, '__set_values: Skip: %s' % con_attribute)
1168
1168
1169
	def add_in_ucs(self, property_type, object, module, position):
1169
	def add_in_ucs(self, property_type, object, module, position):
1170
		objectGUID = object['attributes'].get('objectGUID', [None])[0]  # to compensate for __object_from_element
1171
		if objectGUID:
1172
			objectGUID = decode_guid(objectGUID)
1173
1174
		entryUUID = self._get_entryUUID(object['dn'])
1175
		if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
1176
			ud.debug(ud.LDAP, ud.PROCESS, "add_in_ucs: object %s already deleted in UCS, ignoring create" % object['dn'])
1177
			return True
1170
1178
1171
		# reload extended attributes  # FIXME: maybe not necessary
1179
		# reload extended attributes  # FIXME: maybe not necessary
1172
		univention.admin.modules.init(self.lo, univention.admin.uldap.position(self.lo.base), module)
1180
		univention.admin.modules.init(self.lo, univention.admin.uldap.position(self.lo.base), module)
 Lines 1276-1285   class ucs(object): Link Here 
1276
			objectGUID = decode_guid(objectGUID)
1284
			objectGUID = decode_guid(objectGUID)
1277
		entryUUID = self._get_entryUUID(object['dn'])
1285
		entryUUID = self._get_entryUUID(object['dn'])
1278
1286
1279
		if property_type in ['ou', 'container']:
1287
		if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
1280
			if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
1288
			ud.debug(ud.LDAP, ud.PROCESS, "delete_in_ucs: object %s already deleted in UCS, ignoring delete" % object['dn'])
1281
				ud.debug(ud.LDAP, ud.PROCESS, "delete_in_ucs: object %s already deleted in UCS, ignoring delete" % object['dn'])
1289
			return True
1282
				return True
1283
1290
1284
		if property_type == 'windowscomputer':
1291
		if property_type == 'windowscomputer':
1285
			# Special handling for windows computer:
1292
			# Special handling for windows computer:

Return to bug 50593