diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 09:40:49 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 09:42:31 +0100 |
commit | 604f12722a0ab2e3e16e87c785682bd5f744f94f (patch) | |
tree | 7a1af0352e92961b86fd19e832c21125485fbdbc | |
parent | 9b8ae6ba4525a63ba18b9e0e85cf0fb9f2a670f1 (diff) | |
download | poky-604f12722a0ab2e3e16e87c785682bd5f744f94f.tar.gz |
bitbake/data.py: Handle exceptions in export_bars in the same way as emit_var()
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/data.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 9e37f5e32d..223f9c5052 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -233,9 +233,14 @@ def export_vars(d): | |||
233 | keys = (key for key in d.keys() if d.getVarFlag(key, "export")) | 233 | keys = (key for key in d.keys() if d.getVarFlag(key, "export")) |
234 | ret = {} | 234 | ret = {} |
235 | for k in keys: | 235 | for k in keys: |
236 | v = d.getVar(k, True) | 236 | try: |
237 | if v: | 237 | v = d.getVar(k, True) |
238 | ret[k] = v | 238 | if v: |
239 | ret[k] = v | ||
240 | except (KeyboardInterrupt, bb.build.FuncFailed): | ||
241 | raise | ||
242 | except Exception, exc: | ||
243 | pass | ||
239 | return ret | 244 | return ret |
240 | 245 | ||
241 | def update_data(d): | 246 | def update_data(d): |