diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2007-12-05 12:02:41 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-12-05 11:28:47 -0600 |
| commit | 43eacf2852a15828a4becff74efad04f85305a92 (patch) | |
| tree | 9658f2257735321f286e2aa930b3fea5334d68d7 | |
| parent | 145c8eb52d7c782748bdc1e6a087c932243903bc (diff) | |
| download | pacman-43eacf2852a15828a4becff74efad04f85305a92.tar.xz | |
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 <ngaba@bibl.u-szeged.hu>
[Dan: fix spelling of INTALL, fix line wrapping]
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/deps.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |