From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 4 Oct 2013 13:24:50 +0000 (+0100)
Subject: bin/bitbake: Clarify server error message
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7b5938a30a9b0ed83f899a06a88786e8392f8bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bin/bitbake b/bin/bitbake
index 920c6c4fc62..88893f8de6b 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")