summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-04 17:33:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-06 15:27:34 +0000
commit4ba49aca42232286f01c7546013007ecb33a68a6 (patch)
tree500cdc54c5a716175c009cf36eaee3eb0978b102 /bitbake
parent2c9431135d6cae6b1aa7120526757b596581a14e (diff)
downloadpoky-4ba49aca42232286f01c7546013007ecb33a68a6.tar.gz
bitbake: 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. (Bitbake rev: d49d46533704e8b4404e29abfb5a7383d704c91a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index dc8d02e01d..fac57da71d 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -406,7 +406,8 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
406 deps |= set((vardeps or "").split()) 406 deps |= set((vardeps or "").split())
407 deps -= set(varflags.get("vardepsexclude", "").split()) 407 deps -= set(varflags.get("vardepsexclude", "").split())
408 except Exception as e: 408 except Exception as e:
409 raise bb.data_smart.ExpansionError(key, None, e) 409 bb.warn("Exception during build_dependencies for %s" % key)
410 raise
410 return deps, value 411 return deps, value
411 #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) 412 #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
412 #d.setVarFlag(key, "vardeps", deps) 413 #d.setVarFlag(key, "vardeps", deps)