diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-09-06 16:20:43 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-11-11 23:00:54 +0100 |
| commit | ca8acb681a1ccaddf85376ff30c9b13b1a4c943d (patch) | |
| tree | 494ce0b0b8c5cb2bfbda92921188867d33711239 /python/samba | |
| parent | 32ee231da590d7b8aee74728a423b282ae845bce (diff) | |
| download | samba-ca8acb681a1ccaddf85376ff30c9b13b1a4c943d.tar.gz samba-ca8acb681a1ccaddf85376ff30c9b13b1a4c943d.tar.xz samba-ca8acb681a1ccaddf85376ff30c9b13b1a4c943d.zip | |
provision: Fix string replacement ordering
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>
Diffstat (limited to 'python/samba')
| -rw-r--r-- | python/samba/provision/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 4920735b247..151444d156e 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)) |