bitbake: bitbake: fetch2: Safer check for BB_ORIGENV datastore

BB_ORIGENV value on the datastore can be NoneType thus raising an AttributeError
exception when calling the getVar method. To avoid this, a check is done before
accesing it.

[YOCTO #9567]

(Bitbake rev: f368f5ae64a1681873f3d81f3cb8fb38650367b0)

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Leonardo Sandoval 2016-05-03 14:55:48 -05:00 committed by Richard Purdie
parent f00b4e4c3d
commit 4f4f1c1fdb
1 changed files with 2 additions and 1 deletions

View File

@ -813,8 +813,9 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None):
if not cleanup:
cleanup = []
origenv = d.getVar("BB_ORIGENV", False)
for var in exportvars:
val = d.getVar(var, True) or d.getVar("BB_ORIGENV", False).getVar(var, True)
val = d.getVar(var, True) or (origenv and origenv.getVar(var, True))
if val:
cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)