aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@kernel.crashing.org>2020-09-02 15:10:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-03 12:24:10 +0100
commit3a2503c785a5cd9dca0dc68c3aec31b4bec7684b (patch)
treed1bbdd881b7fdc2f5e8b185f86fced3366dd2923
parent6059d0e77f60ddb679049bd34478f41b1ab7995d (diff)
downloadbitbake-3a2503c785a5cd9dca0dc68c3aec31b4bec7684b.tar.gz
process.py: Handle SystemExit exception to eliminate backtrace
With an invalid layer, the desired error output should be: ERROR: The following layer directories do not exist: ERROR: /this_path_does_not_exist ERROR: Please check BBLAYERS in .../build-invalid-layer/conf/bblayers.conf Instead we were met with a backtrace: Traceback (most recent call last): File "/scratch1/fray/xilinx/poky/bitbake/bin/bitbake", line 36, in <module> cookerdata.CookerConfiguration())) ... File "/scratch1/fray/xilinx/poky/bitbake/lib/bb/cookerdata.py", line 267, in parseBaseConfiguration self.data = self.parseConfigurationFiles(self.prefiles, self.postfiles) File "/scratch1/fray/xilinx/poky/bitbake/lib/bb/cookerdata.py", line 358, in parseConfigurationFiles sys.exit(1) SystemExit: 1 Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 8699765a3..c972fe567 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -368,7 +368,7 @@ class ServerCommunicator():
ret, exc = self.recv.get()
# Should probably turn all exceptions in exc back into exceptions?
# For now, at least handle BBHandledException
- if exc and "BBHandledException" in exc:
+ if exc and ("BBHandledException" in exc or "SystemExit" in exc):
raise bb.BBHandledException()
return ret, exc