The branch, master has been updated via c6b93d2 Avoid uppercasing server role in error message. from e53dfeb s3: Remove some unused code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c6b93d2f843402aacaf314c919bb8e6368817ca4 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 3 19:13:45 2011 +0200 Avoid uppercasing server role in error message. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Sun Apr 3 20:01:48 CEST 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: .../scripting/python/samba/provision/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 55774c2..ff9b001 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -489,7 +489,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, 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)) 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").upper(), serverrole, lp.configfile)) + 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"), serverrole, lp.configfile)) if serverrole == "domain controller": if domain is None: -- Samba Shared Repository