diff options
author | Richard Purdie <richard@openedhand.com> | 2007-10-21 22:35:46 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-10-21 22:35:46 +0000 |
commit | c033c91c6b8c2cc266081c9140dc873fa5ab1085 (patch) | |
tree | 46e42770ddc86c38be08f3b83ea047e716fd011f | |
parent | 6a0a9adb7489ee956bd4559c89679ced107a0545 (diff) | |
download | poky-c033c91c6b8c2cc266081c9140dc873fa5ab1085.tar.gz |
bitbake: providers.py: Fix perferred_version variable handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2947 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | bitbake/lib/bb/providers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index da762d3d5b..2f6b620b3d 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -70,6 +70,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
70 | """ | 70 | """ |
71 | 71 | ||
72 | preferred_file = None | 72 | preferred_file = None |
73 | preferred_ver = None | ||
73 | 74 | ||
74 | localdata = data.createCopy(cfgData) | 75 | localdata = data.createCopy(cfgData) |
75 | bb.data.setVar('OVERRIDES', "pn-%s:%s:%s" % (pn, pn, data.getVar('OVERRIDES', localdata)), localdata) | 76 | bb.data.setVar('OVERRIDES', "pn-%s:%s:%s" % (pn, pn, data.getVar('OVERRIDES', localdata)), localdata) |
@@ -115,7 +116,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
115 | else: | 116 | else: |
116 | bb.msg.debug(1, bb.msg.domain.Provider, "selecting %s as PREFERRED_VERSION %s of package %s%s" % (preferred_file, pv_str, pn, itemstr)) | 117 | bb.msg.debug(1, bb.msg.domain.Provider, "selecting %s as PREFERRED_VERSION %s of package %s%s" % (preferred_file, pv_str, pn, itemstr)) |
117 | 118 | ||
118 | return (preferred_v, preferred_file) | 119 | return (preferred_ver, preferred_file) |
119 | 120 | ||
120 | 121 | ||
121 | def findLatestProvider(pn, cfgData, dataCache, file_set): | 122 | def findLatestProvider(pn, cfgData, dataCache, file_set): |