From c6f6f054b25a0c6156f92444876d4dd66f5c9588 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 Aug 2007 10:07:57 +0000 Subject: providers.py: Fix regressions --- lib/bb/providers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/bb/providers.py') 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 -- cgit 1.2.3-korg