From f7b1c1056e6698bd092ac8ce526523bb3d06c39d Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 9 Sep 2010 15:09:50 +0100
Subject: bitbake/__init__.py: Fix named SRCREVS variable name ordering with
backwards compatibility
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
bitbake/lib/bb/fetch/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'bitbake')
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":
--
cgit v1.2.3