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

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

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index fb8e9e4d0c5f62a7a29b6889bf76ec035923cba4..4e03fc9884f940c93a7efc0cadf5472ff9af31a7 100644 (file)
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -498,11 +498,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":