summaryrefslogtreecommitdiffstats
path: root/python/samba/tests/upgradeprovision.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-03-22 16:19:27 +1100
committerStefan Metzmacher <metze@samba.org>2013-03-25 10:33:37 +0100
commit9040e2684161ce75738e9da0fee191aa34858607 (patch)
treed5e2b7f583feec8492f1ba422f9ccf60a2081a4a /python/samba/tests/upgradeprovision.py
parenta113ddbf881c5905bbf7072638c7ba8843eeb85e (diff)
downloadsamba-9040e2684161ce75738e9da0fee191aa34858607.tar.gz
samba-9040e2684161ce75738e9da0fee191aa34858607.tar.xz
samba-9040e2684161ce75738e9da0fee191aa34858607.zip
scripting: Move get_diff_sds from samba.upgradehelpers to samba.descriptor
This helps avoid a dependency loop when we use get_diff_sds in dbcheck. Andrew Bartlett Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'python/samba/tests/upgradeprovision.py')
-rw-r--r--python/samba/tests/upgradeprovision.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py
index bc3509e530..d785bc1cb4 100644
--- a/python/samba/tests/upgradeprovision.py
+++ b/python/samba/tests/upgradeprovision.py
@@ -19,9 +19,9 @@
import os
from samba.upgradehelpers import (usn_in_range, dn_sort,
- get_diff_sds, update_secrets,
+ update_secrets,
construct_existor_expr)
-
+from samba.descriptor import get_diff_sds
from samba.tests.provision import create_dummy_secretsdb
from samba.tests import TestCaseInTempDir
from samba import Ldb