bitbake/fetch2: Ensure SRCREV_pn-PN is checked for a revision when the SRC_URI is...

(From Poky rev: 707132c60a84cdcf50da056c68f2da7402d3b2e8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 9e09c53b72de15f714705a2b0925c76270b9c9a0..16c956059f8429ce86f647befef9b79f907ad27c 100644 (file)
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -497,11 +497,13 @@ def srcrev_internal_helper(ud, d, name):
         return ud.parm['tag']
 
     rev = None
+    pn = data.getVar("PN", d, True)
     if name != '':
-        pn = data.getVar("PN", d, True)
         rev = data.getVar("SRCREV_%s_pn-%s" % (name, pn), d, True)
         if not rev:
             rev = data.getVar("SRCREV_%s" % name, d, True)
+    if not rev:
+       rev = data.getVar("SRCREV_pn-%s" % pn, d, True)
     if not rev:
         rev = data.getVar("SRCREV", d, True)
     if rev == "INVALID":