mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Fix breakage in checkdeps when upgrading a multiple-depend
Fixes pactest upgrade059. Posted on the ML in the following messages: http://archlinux.org/pipermail/pacman-dev/2007-April/008127.html http://archlinux.org/pipermail/pacman-dev/2007-April/008129.html Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
da6b175d01
commit
970f15d832
@ -270,12 +270,9 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
|
|||||||
for(l = _alpm_db_get_pkgcache(db); l; l = l->next) {
|
for(l = _alpm_db_get_pkgcache(db); l; l = l->next) {
|
||||||
pmpkg_t *pkg = l->data;
|
pmpkg_t *pkg = l->data;
|
||||||
|
|
||||||
if(strcmp(alpm_pkg_get_name(pkg), alpm_pkg_get_name(oldpkg)) == 0) {
|
if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) {
|
||||||
/* well, we know this one succeeds, but we're removing it... skip it */
|
/* we ignore packages that will be updated because we know
|
||||||
continue;
|
* that the updated ones don't satisfy depend */
|
||||||
}
|
|
||||||
|
|
||||||
if(alpm_depcmp(pkg, depend)) {
|
|
||||||
_alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"),
|
_alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"),
|
||||||
depend->name, alpm_pkg_get_name(pkg));
|
depend->name, alpm_pkg_get_name(pkg));
|
||||||
satisfied = 1;
|
satisfied = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user