Skip to content

Preferred version sort #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DoxaLogosGit wants to merge 3 commits into from
Closed

Preferred version sort #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c586a34
get the latest version of the preferred version that matches the sear…
DoxaLogosGit Apr 9, 2014
c4a08a8
remove unnecessary line
DoxaLogosGit Apr 9, 2014
965cf7d
remove extra empty line
DoxaLogosGit Apr 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions lib/bb/providers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
preferred_e = None
preferred_r = None

preferred_list = []
for file_set in pkg_pn:
for f in file_set:
pe, pv, pr = dataCache.pkg_pepvpr[f]
if preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r):
preferred_file = f
preferred_ver = (pe, pv, pr)
break
if preferred_file:
break;
preferred_list.append((f, pe, pv, pr))

preferred_list = sorted(preferred_list,cmp = utils.vercmp, key = lambda entry: (entry[1],entry[2],entry[3]), reverse=True)

if preferred_r:
pv_str = '%s-%s' % (preferred_v, preferred_r)
else:
Expand All @@ -160,8 +160,11 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
itemstr = ""
if item:
itemstr = " (for item %s)" % item
if preferred_file is None:
logger.info("preferred version %s of %s not available%s", pv_str, pn, itemstr)

if preferred_list == []:
logger.warning("preferred version %s of %s not available%s", pv_str, pn, itemstr)
preferred_file = None
preferred_ver = None
available_vers = []
for file_set in pkg_pn:
for f in file_set:
Expand All @@ -175,6 +178,8 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
available_vers.sort()
logger.info("versions of %s available: %s", pn, ' '.join(available_vers))
else:
preferred_file = preferred_list[0][0]
preferred_ver = (preferred_list[0][1],preferred_list[0][2],preferred_list[0][3])
logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr)

return (preferred_ver, preferred_file)
Expand Down