summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2016-05-03 14:55:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:36:02 +0100
commitae832446d963eb63078a90099284a279520664a4 (patch)
tree899bbcc2600e2135b1c3456e78f7ab6485bf4083
parentba29029581eaa4534d85c090d6924d24e4386dbc (diff)
downloadpoky-ae832446d963eb63078a90099284a279520664a4.tar.gz
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) (Bitbake rev: 25859009b710cb35ac8f9ee9eb3a7305f9e13402) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index e8fbe89a3a..6ef0c6fe7a 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -813,8 +813,9 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None):
813 if not cleanup: 813 if not cleanup:
814 cleanup = [] 814 cleanup = []
815 815
816 origenv = d.getVar("BB_ORIGENV", False)
816 for var in exportvars: 817 for var in exportvars:
817 val = d.getVar(var, True) or d.getVar("BB_ORIGENV", False).getVar(var, True) 818 val = d.getVar(var, True) or (origenv and origenv.getVar(var, True))
818 if val: 819 if val:
819 cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd) 820 cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
820 821