diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-03-21 13:34:26 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-03-25 10:32:11 +0100 |
| commit | 352aff8ed7e06c14b7a00a56b31c79ffddf71dd4 (patch) | |
| tree | e8987e4ac3db1a7c05536c19778315b6ce4316eb /source4/scripting/bin/samba_upgradeprovision | |
| parent | e81a97dd6fc2da701f2cbf42513311a7a44adad3 (diff) | |
| download | samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.tar.gz samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.tar.bz2 samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.zip | |
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>
Diffstat (limited to 'source4/scripting/bin/samba_upgradeprovision')
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index c6fc8f26e0..c0ce040801 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) |