diff options
| author | Jeremy Puhlman <jpuhlman@mvista.com> | 2016-08-01 09:02:54 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:05:47 +0100 |
| commit | 25ebd3bbc1f9f4b1b6147d98dd43690c3bf03ee7 (patch) | |
| tree | a0fd51085319512277d93c5e169bc5bf06c236d8 | |
| parent | badec3d10fcdd2d000450ab533caadcff1df5e13 (diff) | |
| download | openembedded-core-25ebd3bbc1f9f4b1b6147d98dd43690c3bf03ee7.tar.gz openembedded-core-25ebd3bbc1f9f4b1b6147d98dd43690c3bf03ee7.tar.bz2 openembedded-core-25ebd3bbc1f9f4b1b6147d98dd43690c3bf03ee7.zip | |
Fix random python backtrace in mutlilib handling code.
newval is not defined in all cases. Set to None and check if it is set.
File
"/local/foo/builds/x86/layers/openembedded-core/meta/classes/multilib_global.bbclass",
line 90, in preferred_ml_updates(d=<bb.data_smart.DataSmart object at
0xf6fd528c>):
if not d.getVar(newname, False):
> d.setVar(newname, localdata.expand(newval))
# Avoid future variable key expansion
UnboundLocalError: local variable 'newval' referenced before assignment
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 67dc72b76c..11ae2681f0 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -72,6 +72,7 @@ def preferred_ml_updates(d): pkg = pkg.replace("virtual/", "") virt = "virtual/" for p in prefixes: + newval = None if pkg != "kernel": newval = p + "-" + val @@ -86,7 +87,7 @@ def preferred_ml_updates(d): # implement alternative multilib name newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) - if not d.getVar(newname, False): + if not d.getVar(newname, False) and newval != None: d.setVar(newname, localdata.expand(newval)) # Avoid future variable key expansion provexp = d.expand(prov) |