summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-09-06 16:20:43 +0200
committerAndrew Bartlett <abartlet@samba.org>2013-10-30 09:13:45 +1300
commit9dac02cabe41babfe16c7b1b003ed60277c4f799 (patch)
tree40156e6a86a94010e02f4cd4afa950e5f7c44584
parent30e5a5c5bfd75303449956553b47b6cc82930291 (diff)
downloadsamba-9dac02cabe41babfe16c7b1b003ed60277c4f799.tar.gz
samba-9dac02cabe41babfe16c7b1b003ed60277c4f799.tar.bz2
samba-9dac02cabe41babfe16c7b1b003ed60277c4f799.zip
provision: Fix string replacement ordering
-rw-r--r--python/samba/provision/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index d8f353f54a..6064043645 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -599,7 +599,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
raise ProvisioningError("guess_names: 'realm =' was not specified in supplied %s. Please remove the smb.conf file and let provision generate it" % lp.configfile)
if lp.get("realm").upper() != realm:
- raise ProvisioningError("guess_names: 'realm=%s' in %s must match chosen realm '%s'! Please remove the smb.conf file and let provision generate it" % (lp.get("realm").upper(), realm, lp.configfile))
+ raise ProvisioningError("guess_names: 'realm=%s' in %s must match chosen realm '%s'! Please remove the smb.conf file and let provision generate it" % (lp.get("realm").upper(), lp.configfile, realm))
if lp.get("server role").lower() != serverrole:
raise ProvisioningError("guess_names: 'server role=%s' in %s must match chosen server role '%s'! Please remove the smb.conf file and let provision generate it" % (lp.get("server role"), lp.configfile, serverrole))