bitbake/data.py: Handle exceptions in export_bars in the same way as emit_var()

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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):
     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):