summaryrefslogtreecommitdiff
path: root/poky/bitbake/lib/bb/command.py
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-11-18 19:42:21 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-11-20 16:38:24 +0300
commitf034379238f980a8c5ec4295288448eab2a3d015 (patch)
tree1787275509bc13436dbec1a548169ef5f8ae0538 /poky/bitbake/lib/bb/command.py
parentbc442de08ff2e45ae01cb74397ccf010ef9797af (diff)
downloadopenbmc-f034379238f980a8c5ec4295288448eab2a3d015.tar.xz
Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470""
This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673. A fix has been put up for openbmc/openbmc#3720 so we can bring this back now Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6
Diffstat (limited to 'poky/bitbake/lib/bb/command.py')
-rw-r--r--poky/bitbake/lib/bb/command.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/poky/bitbake/lib/bb/command.py b/poky/bitbake/lib/bb/command.py
index f8c6a03bb9..dd77cdd6e2 100644
--- a/poky/bitbake/lib/bb/command.py
+++ b/poky/bitbake/lib/bb/command.py
@@ -81,8 +81,12 @@ class Command:
result = command_method(self, commandline)
except CommandError as exc:
return None, exc.args[0]
- except (Exception, SystemExit):
+ except (Exception, SystemExit) as exc:
import traceback
+ if isinstance(exc, bb.BBHandledException):
+ # We need to start returning real exceptions here. Until we do, we can't
+ # tell if an exception is an instance of bb.BBHandledException
+ return None, "bb.BBHandledException()\n" + traceback.format_exc()
return None, traceback.format_exc()
else:
return result, None