[gnome-continuous-yocto/gnomeostree-3.28-rocko: 57/8267] bitbake: bitbake: fetch2: Safer check for BB_ORIGENV datastore

[Emmanuele Bassi <ebassi src gnome org>]

commit 4f4f1c1fdbae84c6df0b5748258117c7a3438160
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Tue May 3 14:55:48 2016 -0500

    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>

 bitbake/lib/bb/fetch2/__init__.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index e8fbe89..6ef0c6f 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):
     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)