From 43eacf2852a15828a4becff74efad04f85305a92 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Wed, 5 Dec 2007 12:02:41 +0100 Subject: Remove duplicated PM_TRANS_CONV_INSTALL_IGNOREPKG message Now alpm_checkdeps first search for literals, then search for no-literal satisfiers Signed-off-by: Nagy Gabor [Dan: fix spelling of INTALL, fix line wrapping] Signed-off-by: Dan McGee --- lib/libalpm/deps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/deps.c') diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7529ec98..0bfa4735 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -550,13 +550,15 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, /*TODO this autoresolves the first 'satisfier' package... we should fix this * somehow */ /* check provides */ + /* we don't check literals again to avoid duplicated PM_TRANS_CONV_INSTALL_IGNOREPKG messages */ for(j = dbs_sync; j && !found; j = j->next) { for(k = _alpm_db_get_pkgcache(j->data); k && !found; k = k->next) { sync = k->data; if(!sync) { continue; } - found = alpm_depcmp(sync, missdep) && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove); + found = alpm_depcmp(sync, missdep) && strcmp(sync->name, missdep->name) + && !_alpm_pkg_find(alpm_pkg_get_name(sync), remove); if(!found) { continue; } -- cgit v1.2.3-24-g4f1b