diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-04 14:24:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-04 15:34:13 +0100 |
commit | d7b5938a30a9b0ed83f899a06a88786e8392f8bd (patch) | |
tree | fdacaf5725048ea564cf4a4bfff3fcca902dd8d8 | |
parent | a886cda58415085981646fb9a024fa7641f55865 (diff) | |
download | bitbake-d7b5938a30a9b0ed83f899a06a88786e8392f8bd.tar.gz |
bin/bitbake: Clarify server error message
Getting an error message about --remote-server being set when really
BBSERVER was is confusing, clarify the message.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bin/bitbake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/bitbake b/bin/bitbake index 920c6c4fc..88893f8de 100755 --- a/bin/bitbake +++ b/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") |