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 <metze@samba.org>

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 aac0ee36b2a9722d5b64f8bb74ad03c9c4b9e3f9..ee4cc10dca5a50dab8e741dff2badb395d0c4f4b 100644 (file)
--- 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 4522683fe8b2f334cbfc1317ada10b0dbf729963..a5a45cf4942958b09ba7f9bfb9c31242a6ac3b46 100644 (file)
--- 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 c6fc8f26e084b279eb0d3e53d9f7df1bdcaec4ad..c0ce040801baa74841699514f5db8dcfab7098f4 100755 (executable)
--- 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)