summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-09-06 16:20:43 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-10-27 07:12:51 +0100
commit0356fc7c03e03584faf81708ed5dacc48f99c717 (patch)
tree3343fdfd0b4b4ab1acc2a4f2118e5daaab08f5de
parent9c1c3bb4ecb47c10548c7d80784ac293cd91aa89 (diff)
downloadsamba-0356fc7c03e03584faf81708ed5dacc48f99c717.tar.gz
samba-0356fc7c03e03584faf81708ed5dacc48f99c717.tar.bz2
samba-0356fc7c03e03584faf81708ed5dacc48f99c717.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))