[oe-commits] [bitbake] 05/07: fetch2: do not suffix srcrev cache key with PN

git at git.openembedded.org git at git.openembedded.org
Sat Jan 18 17:47:25 UTC 2020


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

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

commit abeb68d819bf060a9ceec7d6ead2a8c02296790b
Author: Chris Laplante <chris.laplante at agilent.com>
AuthorDate: Thu Jan 16 11:28:03 2020 -0500

    fetch2: do not suffix srcrev cache key with PN
    
    Prior to this change, two different recipes pulling from the same
    exact repo could get a different SRCREV during a single parse session.
    
    This was originally observed using git. For git at least, it still
    allows recipes to pull from the same repo, but with different branches
    or tags, since the form of the srcrev cache key for git is:
    
            "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name]
    
    Where the 'unresolvedrev' part is the branch or tag name.
    
    Signed-off-by: Chris Laplante <chris.laplante at agilent.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 18a6819..406a91c 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1567,8 +1567,7 @@ class FetchMethod(object):
         return True, str(latest_rev)
 
     def generate_revision_key(self, ud, d, name):
-        key = self._revision_key(ud, d, name)
-        return "%s-%s" % (key, d.getVar("PN") or "")
+        return self._revision_key(ud, d, name)
 
     def latest_versionstring(self, ud, d):
         """

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


More information about the Openembedded-commits mailing list