From b28ea877e096bbfc89be8851f971383a2243e99d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 May 2016 08:17:32 +0100 Subject: bitbake: data/event/siggen: Fix various exceptions [FIXME] (Bitbake rev: f1e4a3c550895fb06e1297682c756d8d57cccbf0) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 1 + bitbake/lib/bb/event.py | 3 ++- bitbake/lib/bb/siggen.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index e9ce0ad4d0..9bc7e6ab0a 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -408,6 +408,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): deps -= set(varflags.get("vardepsexclude", "").split()) except Exception as e: bb.warn("Exception during build_dependencies for %s" % key) + bb.warn(str(e)) raise return deps, value #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index 6fb37128ea..023300bed9 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py @@ -157,7 +157,8 @@ def fire_ui_handlers(event, d): _ui_handlers[h].event.sendpickle((pickle.dumps(event))) else: _ui_handlers[h].event.send(event) - except: + except Exception as e: + print(str(e)) errors.append(h) for h in errors: del _ui_handlers[h] diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 3352329266..e7c6b3eb1c 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -149,8 +149,9 @@ class SignatureGeneratorBasic(SignatureGenerator): try: taskdeps = self._build_data(fn, d) - except: + except Exception as e: bb.warn("Error during finalise of %s" % fn) + bb.error(str(e)) raise #Slow but can be useful for debugging mismatched basehashes -- cgit v1.2.3-54-g00ecf