diff options
Diffstat (limited to 'bitbake/lib/bb')
| -rw-r--r-- | bitbake/lib/bb/providers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index dcba9ae255..edd54d0c83 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
| @@ -84,10 +84,10 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
| 84 | preferred_ver = None | 84 | preferred_ver = None |
| 85 | 85 | ||
| 86 | localdata = data.createCopy(cfgData) | 86 | localdata = data.createCopy(cfgData) |
| 87 | bb.data.setVar('OVERRIDES', "pn-%s:%s:%s" % (pn, pn, data.getVar('OVERRIDES', localdata)), localdata) | 87 | bb.data.setVar('OVERRIDES', "%s:pn-%s:%s" % (data.getVar('OVERRIDES', localdata), pn, pn), localdata) |
| 88 | bb.data.update_data(localdata) | 88 | bb.data.update_data(localdata) |
| 89 | 89 | ||
| 90 | preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, localdata, True) | 90 | preferred_v = bb.data.getVar('PREFERRED_VERSION', localdata, True) |
| 91 | if preferred_v: | 91 | if preferred_v: |
| 92 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) | 92 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) |
| 93 | if m: | 93 | if m: |
