From 352aff8ed7e06c14b7a00a56b31c79ffddf71dd4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 21 Mar 2013 13:34:26 +1100 Subject: [PATCH] scripting: Move samba.provision.descriptor to samba.descriptor This will allow dbcheck to import it, without a cirucular dependency via samba.provision importing dbcheck. Andrew Bartlett Reviewed-by: Stefan Metzmacher --- python/samba/{provision => }/descriptor.py | 0 python/samba/provision/__init__.py | 2 +- python/samba/provision/sambadns.py | 2 +- source4/scripting/bin/samba_upgradeprovision | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename python/samba/{provision => }/descriptor.py (100%) diff --git a/python/samba/provision/descriptor.py b/python/samba/descriptor.py similarity index 100% rename from python/samba/provision/descriptor.py rename to python/samba/descriptor.py diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index aac0ee36b2a..ee4cc10dca5 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -76,7 +76,7 @@ from samba.provision.backend import ( LDBBackend, OpenLDAPBackend, ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_empty_descriptor, get_config_descriptor, get_config_partitions_descriptor, diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 4522683fe8b..a5a45cf4942 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -36,7 +36,7 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2 ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_domain_descriptor, get_domain_delete_protected1_descriptor, get_domain_delete_protected2_descriptor, diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index c6fc8f26e08..c0ce040801b 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -46,7 +46,7 @@ from ldb import (SCOPE_SUBTREE, SCOPE_BASE, MessageElement, Message, Dn, LdbError) from samba import param, dsdb, Ldb from samba.common import confirm -from samba.provision.descriptor import get_wellknown_sds, get_empty_descriptor +from samba.descriptor import get_wellknown_sds, get_empty_descriptor from samba.provision import (find_provision_key_parameters, ProvisioningError, get_last_provision_usn, get_max_usn, update_provision_usn, setup_path) -- 2.34.1