From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 4 Jan 2016 17:33:26 +0000 (+0000)
Subject: data: Drop misleading ExpansionError exception
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d49d46533704e8b4404e29abfb5a7383d704c91a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

data: Drop misleading ExpansionError exception

This codepath can be triggered by a python indentation error for example.
Showing it as an ExpansionError is misleading.

Change the code to add a warning about where the failure came from (in
particular giving the variable key name that triggered it) but raise the
proper exception.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/data.py b/lib/bb/data.py
index dc8d02e01d9..fac57da71d8 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -406,7 +406,8 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
         deps |= set((vardeps or "").split())
         deps -= set(varflags.get("vardepsexclude", "").split())
     except Exception as e:
-        raise bb.data_smart.ExpansionError(key, None, e)
+        bb.warn("Exception during build_dependencies for %s" % key)
+        raise
     return deps, value
     #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
     #d.setVarFlag(key, "vardeps", deps)