summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/server
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-05 11:45:16 +0100
commit4cb33dae15adb7f88a35a3630368db16923bca7e (patch)
tree0f9cf13c6fc4b5990a6e2885de6adca681588824 /bitbake/lib/bb/server
parentc24ece07fa7ded61ac614854a5b9d7ec46e60bd7 (diff)
downloadpoky-4cb33dae15adb7f88a35a3630368db16923bca7e.tar.gz
bitbake: 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 (Bitbake rev: 3a2503c785a5cd9dca0dc68c3aec31b4bec7684b) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/server')
-rw-r--r--bitbake/lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 8699765a31..c972fe567d 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -368,7 +368,7 @@ class ServerCommunicator():
368 ret, exc = self.recv.get() 368 ret, exc = self.recv.get()
369 # Should probably turn all exceptions in exc back into exceptions? 369 # Should probably turn all exceptions in exc back into exceptions?
370 # For now, at least handle BBHandledException 370 # For now, at least handle BBHandledException
371 if exc and "BBHandledException" in exc: 371 if exc and ("BBHandledException" in exc or "SystemExit" in exc):
372 raise bb.BBHandledException() 372 raise bb.BBHandledException()
373 return ret, exc 373 return ret, exc
374 374