summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-12 07:17:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 22:32:41 (GMT)
commitb28ea877e096bbfc89be8851f971383a2243e99d (patch)
tree3ac3bc0f7f3d6fd3092b2cca0a7cbab4aa58d151
parent3a6ae48e51607d4c31319bc60e2a96dbec856147 (diff)
downloadpoky-b28ea877e096bbfc89be8851f971383a2243e99d.tar.gz
bitbake: data/event/siggen: Fix various exceptions [FIXME]
(Bitbake rev: f1e4a3c550895fb06e1297682c756d8d57cccbf0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data.py1
-rw-r--r--bitbake/lib/bb/event.py3
-rw-r--r--bitbake/lib/bb/siggen.py3
3 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index e9ce0ad..9bc7e6a 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):
408 deps -= set(varflags.get("vardepsexclude", "").split()) 408 deps -= set(varflags.get("vardepsexclude", "").split())
409 except Exception as e: 409 except Exception as e:
410 bb.warn("Exception during build_dependencies for %s" % key) 410 bb.warn("Exception during build_dependencies for %s" % key)
411 bb.warn(str(e))
411 raise 412 raise
412 return deps, value 413 return deps, value
413 #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) 414 #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 6fb3712..023300b 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -157,7 +157,8 @@ def fire_ui_handlers(event, d):
157 _ui_handlers[h].event.sendpickle((pickle.dumps(event))) 157 _ui_handlers[h].event.sendpickle((pickle.dumps(event)))
158 else: 158 else:
159 _ui_handlers[h].event.send(event) 159 _ui_handlers[h].event.send(event)
160 except: 160 except Exception as e:
161 print(str(e))
161 errors.append(h) 162 errors.append(h)
162 for h in errors: 163 for h in errors:
163 del _ui_handlers[h] 164 del _ui_handlers[h]
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 3352329..e7c6b3e 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -149,8 +149,9 @@ class SignatureGeneratorBasic(SignatureGenerator):
149 149
150 try: 150 try:
151 taskdeps = self._build_data(fn, d) 151 taskdeps = self._build_data(fn, d)
152 except: 152 except Exception as e:
153 bb.warn("Error during finalise of %s" % fn) 153 bb.warn("Error during finalise of %s" % fn)
154 bb.error(str(e))
154 raise 155 raise
155 156
156 #Slow but can be useful for debugging mismatched basehashes 157 #Slow but can be useful for debugging mismatched basehashes