[pacman-dev,3/4] libalpm: short circuit alpm_find_dbs_satisfier

Message ID 20190908214529.3512-3-morganamilo@gmail.com
State New
Headers show
Series
  • [pacman-dev,1/4] libalpm: fix incorrect documentation
Related show

Commit Message

Morgan Adamiec Sept. 8, 2019, 9:45 p.m. UTC
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.
---
 lib/libalpm/deps.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Patch

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 = {