Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libalpm/deps.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 322c4e7e..f69f24ad 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -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",
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);
/* 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);
if(count >= 1) {
alpm_question_select_provider_t question = {