bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm: short circuit alpm_find_dbs_satisfier

Browse source 
when a satisfying package is already installed, we always pick it
instead of prompting the user. So we can return that package as soon as
we find it, instead of waiting until we've iterated through all the
databases.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2019-09-08 22:45:28 +01:00 • committed by Allan McRae
parent 0a295f3f39
commit f2442bc2e9
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/libalpm/deps.c
View file

@ -719,20 +719,19 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep,
} }
_alpm_log(handle, ALPM_LOG_DEBUG, "provider found (%s provides %s)\n", _alpm_log(handle, ALPM_LOG_DEBUG, "provider found (%s provides %s)\n",
pkg->name, dep->name); pkg->name, dep->name);
/* provide is already installed so return early instead of prompting later */
if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) {
alpm_list_free(providers);
return pkg;
}
providers = alpm_list_add(providers, pkg); providers = alpm_list_add(providers, pkg);
/* keep looking for other providers in the all dbs */ /* keep looking for other providers in the all dbs */
} }
} }
} }
/* first check if one provider is already installed locally */
for(i = providers; i; i = i->next) {
alpm_pkg_t *pkg = i->data;
if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) {
alpm_list_free(providers);
return pkg;
}
}
count = alpm_list_count(providers); count = alpm_list_count(providers);
if(count >= 1) { if(count >= 1) {
alpm_question_select_provider_t question = { alpm_question_select_provider_t question = {