View | Details | Raw Unified | Return to bug 52874 | Differences between
and this patch

Collapse All | Expand All

(-)a/services/univention-ad-connector/modules/univention/connector/ad/__init__.py (-5 / +3 lines)
Lines 932-945 class ad(univention.connector.ucs): Link Here
932
			def _sortkey_ascending_usnchanged(element):
932
			def _sortkey_ascending_usnchanged(element):
933
				return int(element[1]['uSNChanged'][0])
933
				return int(element[1]['uSNChanged'][0])
934
934
935
			def _sortkey_created_since_last(element):
936
				return 0 if int(element[1]['uSNCreated'][0]) > last_usn else 1
937
938
			if last_usn <= 0:
935
			if last_usn <= 0:
939
				return sorted(res, key=_sortkey_ascending_usncreated)
936
				return sorted(res, key=_sortkey_ascending_usncreated)
940
			else:
937
			else:
941
				res_ascending_usnchanged = sorted(res, key=_sortkey_ascending_usnchanged)
938
				created_since_last = [x for x in res if int(x[1]['uSNCreated'][0]) >= last_usn]
942
				return sorted(res_ascending_usnchanged, key=_sortkey_created_since_last)
939
				changed_since_last = [x for x in res if int(x[1]['uSNChanged'][0]) >= last_usn and x not in created_since_last]
940
				return sorted(created_since_last, key=_sortkey_ascending_usncreated) + sorted(changed_since_last, key=_sortkey_ascending_usnchanged)
943
941
944
		# search for objects with uSNCreated and uSNChanged in the known range
942
		# search for objects with uSNCreated and uSNChanged in the known range
945
		try:
943
		try:

Return to bug 52874