mirror of
https://github.com/samba-team/samba.git
synced 2025-01-27 14:04:05 +03:00
s4/scripting: PY3 need to convert cmp funct to key func for sort.
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
412002629e
commit
dcf787b263
@ -70,6 +70,7 @@ from samba.upgradehelpers import (dn_sort, get_paths, newprovision,
|
|||||||
increment_calculated_keyversion_number,
|
increment_calculated_keyversion_number,
|
||||||
print_provision_ranges)
|
print_provision_ranges)
|
||||||
from samba.xattr import copytree_with_xattrs
|
from samba.xattr import copytree_with_xattrs
|
||||||
|
from samba.compat import cmp_to_key_fn
|
||||||
|
|
||||||
# make sure the script dies immediately when hitting control-C,
|
# make sure the script dies immediately when hitting control-C,
|
||||||
# rather than raising KeyboardInterrupt. As we do all database
|
# rather than raising KeyboardInterrupt. As we do all database
|
||||||
@ -1133,8 +1134,8 @@ def update_partition(ref_samdb, samdb, basedn, names, schema, provisionUSNs, pre
|
|||||||
|
|
||||||
# Sort the missing object in order to have object of the lowest level
|
# Sort the missing object in order to have object of the lowest level
|
||||||
# first (which can be containers for higher level objects)
|
# first (which can be containers for higher level objects)
|
||||||
listMissing.sort(dn_sort)
|
listMissing.sort(key=cmp_to_key_fn(dn_sort))
|
||||||
listPresent.sort(dn_sort)
|
listPresent.sort(key=cmp_to_key_fn(dn_sort))
|
||||||
|
|
||||||
# The following lines is to load the up to
|
# The following lines is to load the up to
|
||||||
# date schema into our current LDB
|
# date schema into our current LDB
|
||||||
|
Loading…
x
Reference in New Issue
Block a user