diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-09-06 16:20:43 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-04-29 10:24:53 +0200 |
| commit | 1e75825a0705576550cb0b7d8d723a650ec4073c (patch) | |
| tree | 9b07eca7a1e1708e8ed2aeaf5547fa5923a145fa /python | |
| parent | 2c82031bc12dff2852440737480bc73f0753c52d (diff) | |
| download | samba-1e75825a0705576550cb0b7d8d723a650ec4073c.tar.gz | |
provision: Fix string replacement ordering
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>
(cherry picked from commit ca8acb681a1ccaddf85376ff30c9b13b1a4c943d)
Diffstat (limited to 'python')
| -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 4af6b6955d0..46d2cbc54b4 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -595,7 +595,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)) |