From 604f12722a0ab2e3e16e87c785682bd5f744f94f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Aug 2010 09:40:49 +0100 Subject: bitbake/data.py: Handle exceptions in export_bars in the same way as emit_var() Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 9e37f5e32..223f9c505 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -233,9 +233,14 @@ def export_vars(d): keys = (key for key in d.keys() if d.getVarFlag(key, "export")) ret = {} for k in keys: - v = d.getVar(k, True) - if v: - ret[k] = v + try: + v = d.getVar(k, True) + if v: + ret[k] = v + except (KeyboardInterrupt, bb.build.FuncFailed): + raise + except Exception, exc: + pass return ret def update_data(d): -- cgit v1.2.3