From 20b3be7781db6df06beb8273a15872bbd6cceab9 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Fri, 6 Sep 2013 16:20:43 +0200 Subject: provision: Fix string replacement ordering Reviewed-by: Andrew Bartlett --- python/samba/provision/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- cgit