diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-09-06 16:20:43 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-10-29 11:31:12 +1300 |
| commit | 20b3be7781db6df06beb8273a15872bbd6cceab9 (patch) | |
| tree | 40156e6a86a94010e02f4cd4afa950e5f7c44584 | |
| parent | 30e5a5c5bfd75303449956553b47b6cc82930291 (diff) | |
| download | samba-20b3be7781db6df06beb8273a15872bbd6cceab9.tar.gz samba-20b3be7781db6df06beb8273a15872bbd6cceab9.tar.bz2 samba-20b3be7781db6df06beb8273a15872bbd6cceab9.zip | |
provision: Fix string replacement ordering
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -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 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)) |