summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-04 13:24:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 08:37:34 (GMT)
commitf18194c0889d3d90627457f057e88002f297a2e3 (patch)
tree11fea3ec9adcfcd13df4a5da5722cc99aa3449a7
parent06afe1fafe977a7a8bc90e0608bb6d6cba6adca7 (diff)
downloadpoky-f18194c0889d3d90627457f057e88002f297a2e3.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 920c6c4..88893f8 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -262,8 +262,8 @@ def main():
262 if not configParams.bind: 262 if not configParams.bind:
263 sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n") 263 sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n")
264 if configParams.remote_server: 264 if configParams.remote_server:
265 sys.exit("FATAL: The '--server-only' option conflicts with the '--remote-server' option. %s\n" % 265 sys.exit("FATAL: The '--server-only' option conflicts with %s.\n" %
266 ("Please check your BBSERVER environment" if "BBSERVER" in os.environ else "" )) 266 ("the BBSERVER environment variable" if "BBSERVER" in os.environ else "the '--remote-server' option" ))
267 267
268 if configParams.bind and configParams.servertype != "xmlrpc": 268 if configParams.bind and configParams.servertype != "xmlrpc":
269 sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") 269 sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n")