diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-25 14:57:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-27 10:30:35 +0000 |
| commit | 9f7978ca4d59b92721de508113dbac30721014d9 (patch) | |
| tree | c742420397d453629946503aadd891ae5763892c /lib/bb/providers.py | |
| parent | 5ace320ccc01f4e326f90b7ba060dcbff3380dca (diff) | |
| download | bitbake-9f7978ca4d59b92721de508113dbac30721014d9.tar.gz | |
Update users of getVar/setVar to use the data store functions directly
(From Poky rev: affd0907253387cee0ba0c7e9f92bcc109895446)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/providers.py')
| -rw-r--r-- | lib/bb/providers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/providers.py b/lib/bb/providers.py index b2f98963d..454344705 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', "%s:pn-%s:%s" % (data.getVar('OVERRIDES', localdata), pn, pn), localdata) + localdata.setVar('OVERRIDES', "%s:pn-%s:%s" % (data.getVar('OVERRIDES', localdata), pn, pn)) bb.data.update_data(localdata) - preferred_v = bb.data.getVar('PREFERRED_VERSION', localdata, True) + preferred_v = localdata.getVar('PREFERRED_VERSION', True) if preferred_v: m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) if m: @@ -248,7 +248,7 @@ def filterProviders(providers, item, cfgData, dataCache): eligible = _filterProviders(providers, item, cfgData, dataCache) - prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, cfgData, 1) + prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, 1) if prefervar: dataCache.preferred[item] = prefervar @@ -286,7 +286,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): pn = dataCache.pkg_fn[p] provides = dataCache.pn_provides[pn] for provide in provides: - prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1) + prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, 1) logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) if prefervar in pns and pns[prefervar] not in preferred: var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) |