diff options
| author | Bryan Ischo <bji-keyword-pacman.3644cb@www.ischo.com> | 2009-03-09 09:56:13 +1300 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-04-11 14:39:24 -0500 |
| commit | db3e166503386b4f9e456017fd56d8bce84528fe (patch) | |
| tree | 6be74c28ff430128c8a1a7a3064e32d3fe49d5ec /lib/libalpm/deps.c | |
| parent | d70465decc617412db0670c8169ec22421c8e3d1 (diff) | |
| download | pacman-db3e166503386b4f9e456017fd56d8bce84528fe.tar.xz | |
Look in target-list first to resolve dependencies
This fixes a bug introduced by my previous changes which changes the
behavior of IgnorePkg/IgnoreGroup to allow the user to remove unresolvable
packages from the transaction. The bug is that the target-list was no
longer being consulted first to resolve dependencies, which means that if
two packages in the sync database satisfied a dependency, and the user
explicitly requested one of those two packages in the sync, the other
package was still being pulled in.
A new test was added, sync993.py, to verify the desired behavior.
Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb@www.ischo.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/deps.c')
| -rw-r--r-- | lib/libalpm/deps.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 36f4d355..ca2126dc 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -594,8 +594,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, * unmodified by this function */ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, - alpm_list_t **packages, alpm_list_t *remove, - alpm_list_t **data) + alpm_list_t *preferred, alpm_list_t **packages, + alpm_list_t *remove, alpm_list_t **data) { alpm_list_t *i, *j; alpm_list_t *targ; @@ -632,17 +632,21 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, if(_alpm_find_dep_satisfier(*packages, missdep)) { continue; } - /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); + /* check if one of the packages in the [preferred] list already satisfies this dependency */ + pmpkg_t *spkg = _alpm_find_dep_satisfier(preferred, missdep); + if(!spkg) { + /* find a satisfier package in the given repositories */ + spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); + } if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); _alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, tpkg->name); + missdepstring, tpkg->name); free(missdepstring); if(data) { pmdepmissing_t *missd = _alpm_depmiss_new(miss->target, - miss->depend, miss->causingpkg); + miss->depend, miss->causingpkg); if(missd) { *data = alpm_list_add(*data, missd); } @@ -654,7 +658,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, return(-1); } else { _alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); + alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); *packages = alpm_list_add(*packages, spkg); } } |