From 606f1acc6fb8ccec45d6a52ed6ae6dc128011402 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 31 May 2011 23:02:01 +0100 Subject: providers.py: Correct PREFERRED_VERSION handling Overrides on the right are the highest priority and in this case, pn-PN and PN should take priority over any other override so fix the code to do this. Also, since overrides will have been processed by bitbake, we shouldn't then be specifically looking up PREFERRED_VERSION_${PN} but just using PREFERRED_VERSION. This patch corrects the behaviours to match what the code is expected to do. Signed-off-by: Richard Purdie --- lib/bb/providers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/bb/providers.py b/lib/bb/providers.py index dcba9ae25..edd54d0c8 100644 --- a/lib/bb/providers.py +++ b/lib/bb/providers.py @@ -84,10 +84,10 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): preferred_ver = None localdata = data.createCopy(cfgData) - bb.data.setVar('OVERRIDES', "pn-%s:%s:%s" % (pn, pn, data.getVar('OVERRIDES', localdata)), localdata) + bb.data.setVar('OVERRIDES', "%s:pn-%s:%s" % (data.getVar('OVERRIDES', localdata), pn, pn), localdata) bb.data.update_data(localdata) - preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, localdata, True) + preferred_v = bb.data.getVar('PREFERRED_VERSION', localdata, True) if preferred_v: m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) if m: -- cgit 1.2.3-korg