From 4cb33dae15adb7f88a35a3630368db16923bca7e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Sep 2020 15:10:22 -0500 Subject: 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 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake') 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(): 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 -- cgit v1.2.3-54-g00ecf