diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2007-08-24 10:07:57 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2007-08-24 10:07:57 +0000 |
commit | ab3ac5f54f67605b114676b0f2cf197886964107 (patch) | |
tree | 356d27e141534c9a134e485d19353366b836102f | |
parent | 220703bbeb9c4de89c09f4ac61f8a272ac0659e3 (diff) | |
download | bitbake-ab3ac5f54f67605b114676b0f2cf197886964107.tar.gz |
providers.py: Fix regressions
-rw-r--r-- | lib/bb/providers.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/bb/providers.py b/lib/bb/providers.py index 9e97316e9..da762d3d5 100644 --- a/lib/bb/providers.py +++ b/lib/bb/providers.py @@ -55,9 +55,11 @@ def sortPriorities(pn, dataCache, pkg_pn = None): tmp_pn = [] for pri in pri_list: pref_list = priorities[pri].keys() - pref_list.sort(lambda a, b: a - b) - for pref in priorities[pri]: - tmp_pn = [priorities[pri][pref]] + tmp_pn + pref_list.sort(lambda a, b: b - a) + tmp_pref = [] + for pref in pref_list: + tmp_pref.extend(priorities[pri][pref]) + tmp_pn = [tmp_pref] + tmp_pn return tmp_pn @@ -119,6 +121,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): def findLatestProvider(pn, cfgData, dataCache, file_set): """ Return the highest version of the providers in file_set. + Take default preferences into account. """ latest = None latest_p = 0 |