aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 11:47:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 11:47:50 +0000
commit707132c60a84cdcf50da056c68f2da7402d3b2e8 (patch)
tree2ad17c9577df620b607ea22a4290abddedf7dd55
parent56a92105fe6b779c69bccd44c2cff8f21cafdfbd (diff)
downloadopenembedded-core-contrib-707132c60a84cdcf50da056c68f2da7402d3b2e8.tar.gz
bitbake/fetch2: Ensure SRCREV_pn-PN is checked for a revision when the SRC_URI is unnamed
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index fb8e9e4d0c..4e03fc9884 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -498,12 +498,14 @@ 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":
raise FetchError("Please set SRCREV to a valid value", ud.url)