summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-17 12:12:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:46 +0100
commite2ddc18874c8a8b52a22430b2909f37e936a4ccd (patch)
tree20912ea79b356588b1149a118130a5b93c3505ba /bitbake/lib/bb
parent7ce27b9fce8dd9c05d98878185f46721cc2e81f3 (diff)
downloadpoky-e2ddc18874c8a8b52a22430b2909f37e936a4ccd.tar.gz
bitbake: Fix -m handling if cannot connect to server
If we can't connect to the server we should error out, because it might not be that the server is actually dead - it might just be unable to execute commands. (Bitbake rev: d4b921676859d6ba4e1922fa4682ee941652f483) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rwxr-xr-xbitbake/lib/bb/main.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index f08a8ef592..4d77408f6a 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -358,8 +358,6 @@ def bitbake_main(configParams, configuration):
358 try: 358 try:
359 server_connection = server.establishConnection(featureset) 359 server_connection = server.establishConnection(featureset)
360 except Exception as e: 360 except Exception as e:
361 if configParams.kill_server:
362 return 0
363 bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) 361 bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e)))
364 362
365 # Restore the environment in case the UI needs it 363 # Restore the environment in case the UI needs it