Attachment 10638 Details for Bug 52874 – bug52874-fix-proposal2.diff

[patch] bug52874-fix-proposal2.diff

bug52874-fix-proposal2.diff (text/plain), 1.28 KB, created by Arvid Requate on 2021-03-09 14:26:26 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2021-03-09 14:26:26 CET

Size: 1.28 KB

patch

obsolete

>diff --git a/services/univention-ad-connector/modules/univention/connector/ad/__init__.py b/services/univention-ad-connector/modules/univention/connector/ad/__init__.py
>index 61c9fdc4b3..cdc9c1e4fe 100644
>--- a/services/univention-ad-connector/modules/univention/connector/ad/__init__.py
>+++ b/services/univention-ad-connector/modules/univention/connector/ad/__init__.py
>@@ -932,14 +932,12 @@ class ad(univention.connector.ucs):
> 			def _sortkey_ascending_usnchanged(element):
> 				return int(element[1]['uSNChanged'][0])
> 
>-			def _sortkey_created_since_last(element):
>-				return 0 if int(element[1]['uSNCreated'][0]) > last_usn else 1
>-
> 			if last_usn <= 0:
> 				return sorted(res, key=_sortkey_ascending_usncreated)
> 			else:
>-				res_ascending_usnchanged = sorted(res, key=_sortkey_ascending_usnchanged)
>-				return sorted(res_ascending_usnchanged, key=_sortkey_created_since_last)
>+				created_since_last = [x for x in res if int(x[1]['uSNCreated'][0]) >= last_usn]
>+				changed_since_last = [x for x in res if int(x[1]['uSNChanged'][0]) >= last_usn and x not in created_since_last]
>+				return sorted(created_since_last, key=_sortkey_ascending_usncreated) + sorted(changed_since_last, key=_sortkey_ascending_usnchanged)
> 
> 		# search for objects with uSNCreated and uSNChanged in the known range
> 		try:

Actions: View | Diff

Attachments on bug 52874: 10633 | 10634 | 10635 | 10637 | 10638