[oe-commits] [bitbake] 06/20: fetch2: avoid circular recursion with SRCPV in PR

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 05ee4845f925b8528a7ce9cffb4bae425b8fa1e9
Author: Peter Marko <peter.marko at siemens.com>
AuthorDate: Wed Oct 10 12:34:40 2018 +0200

    fetch2: avoid circular recursion with SRCPV in PR
    
    Some recent changes broke SRCPV and workaround was introduced
    to avoid circular dependency if SRCPV is in PV.
    However there is still the same error if SRCPV is in PR.
    
    Signed-off-by: Peter Marko <peter.marko at siemens.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index a83526a..cb2f325 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -837,14 +837,16 @@ 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
+    # If PATH contains WORKDIR which contains PV-PR 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")
+        d.getVar("PR")
     except bb.data_smart.ExpansionError:
         d = bb.data.createCopy(d)
         d.setVar("PV", "fetcheravoidrecurse")
+        d.setVar("PR", "fetcheravoidrecurse")
 
     origenv = d.getVar("BB_ORIGENV", False)
     for var in exportvars:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.