summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-09-06 16:20:43 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-11-08 04:37:47 +0100
commit5a2f22c321cf94b2102777e6310794b08380f7e8 (patch)
tree9328c0c2a82fdcddbcbfda5484ebbad87a2bf34c
parent1eeb6f776269bc53b3bfbe3dc70bb185ec788a8b (diff)
downloadsamba-fixes.tar.gz
samba-fixes.tar.bz2
samba-fixes.zip
provision: Fix string replacement orderingfixes
-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))