summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/upgrade.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-19 09:37:47 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-19 15:43:04 +0200
commit43f23b55c44094b29c8a7017fda8e6b030e2eba4 (patch)
tree05fe90d7da56c4e03a5f2ec93571c6563acb767b /source4/scripting/python/samba/upgrade.py
parentbe9378e41ec677eb36b262db7abf4ddcec6a0675 (diff)
downloadsamba-43f23b55c44094b29c8a7017fda8e6b030e2eba4.tar.gz
samba-43f23b55c44094b29c8a7017fda8e6b030e2eba4.tar.xz
samba-43f23b55c44094b29c8a7017fda8e6b030e2eba4.zip
s4-s3-upgrade rename samba-tool domain samba3upgrade --libdir to --dbdir for clarity
The things pointed at are not typically in a directory called lib, so avoid confusing our administrators. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Wed Oct 19 15:43:04 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
-rw-r--r--source4/scripting/python/samba/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 2a2c17ec2c4..67dd333b9e1 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -473,7 +473,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=Fa
try:
secrets_db = samba3.get_secrets_db()
except IOError, e:
- raise ProvisioningError("Could not open '%s', the Samba3 secrets database: %s. Perhaps you specified the incorrect smb.conf, --testparm or --libdir option?" % (samba3.privatedir_path("secrets.tdb"), str(e)))
+ raise ProvisioningError("Could not open '%s', the Samba3 secrets database: %s. Perhaps you specified the incorrect smb.conf, --testparm or --dbdir option?" % (samba3.privatedir_path("secrets.tdb"), str(e)))
if not domainname:
domainname = secrets_db.domains()[0]