summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/fetch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-09 15:09:50 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-09 15:09:50 +0100
commitf7b1c1056e6698bd092ac8ce526523bb3d06c39d (patch)
tree9a8262d37815d4b6628b7ba0c55fe443979616bf /bitbake/lib/bb/fetch
parent1e65495801ddda1f9db9158723ce8593349cd586 (diff)
downloadopenembedded-core-f7b1c1056e6698bd092ac8ce526523bb3d06c39d.tar.gz
openembedded-core-f7b1c1056e6698bd092ac8ce526523bb3d06c39d.tar.bz2
openembedded-core-f7b1c1056e6698bd092ac8ce526523bb3d06c39d.tar.xz
openembedded-core-f7b1c1056e6698bd092ac8ce526523bb3d06c39d.zip
bitbake/__init__.py: Fix named SRCREVS variable name ordering with backwards compatibility
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r--bitbake/lib/bb/fetch/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index a27b40f6a..6ff7af32c 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -631,7 +631,9 @@ class Fetch(object):
rev = None
if 'name' in ud.parm:
pn = data.getVar("PN", d, 1)
- rev = data.getVar("SRCREV_pn-" + pn + "_" + ud.parm['name'], d, 1)
+ rev = data.getVar("SRCREV_%s_pn-%s" % (ud.parm['name'], pn), d, 1)
+ if not rev:
+ rev = data.getVar("SRCREV_pn-%s_%s" % (pn, ud.parm['name']), d, 1)
if not rev:
rev = data.getVar("SRCREV", d, 1)
if rev == "INVALID":