From f18194c0889d3d90627457f057e88002f297a2e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 Oct 2013 14:24:50 +0100 Subject: bitbake: bin/bitbake: Clarify server error message Getting an error message about --remote-server being set when really BBSERVER was is confusing, clarify the message. (Bitbake rev: d7b5938a30a9b0ed83f899a06a88786e8392f8bd) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 920c6c4fc6..88893f8de6 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -262,8 +262,8 @@ def main(): if not configParams.bind: sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n") if configParams.remote_server: - sys.exit("FATAL: The '--server-only' option conflicts with the '--remote-server' option. %s\n" % - ("Please check your BBSERVER environment" if "BBSERVER" in os.environ else "" )) + sys.exit("FATAL: The '--server-only' option conflicts with %s.\n" % + ("the BBSERVER environment variable" if "BBSERVER" in os.environ else "the '--remote-server' option" )) if configParams.bind and configParams.servertype != "xmlrpc": sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") -- cgit v1.2.3-54-g00ecf