[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4103/8267] bitbake: fetch2: Avoid recursive errors

[Emmanuele Bassi <ebassi src gnome org>]

commit 3f8d56d1132cc63fe13cf81dc97ba96a523e1d44
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sat Jan 14 14:17:13 2017 +0000

    bitbake: fetch2: Avoid recursive errors
    
    If PATH contains WORKDIR which contains PV which contains SRCPV we can end
    up in circular recursion within the fetcher. This code change allows for the recursion
    to be broken by giving PV a temporary dummy value in a data store copy.
    
    (Bitbake rev: ce1e70b8018340b54dba3a81d7d379182cb77514)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/__init__.py |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index d6d7850..525f47e 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -819,6 +819,15 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None):
     if not cleanup:
         cleanup = []
 
+    # If PATH contains WORKDIR which contains PV which contains SRCPV we
+    # can end up in circular recursion here so give the option of breaking it
+    # in a data store copy.
+    try:
+        d.getVar("PV")
+    except bb.data_smart.ExpansionError:
+        d = bb.data.createCopy(d)
+        d.setVar("PV", "fetcheravoidrecurse")
+
     origenv = d.getVar("BB_ORIGENV", False)
     for var in exportvars:
         val = d.getVar(var) or (origenv and origenv.getVar(var))