diff options
author | Bryan Ischo <bryan@ischo.com> | 2009-01-27 01:48:39 +1300 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-02-18 20:52:22 -0600 |
commit | 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 (patch) | |
tree | e42526db6738439c71cf74fe6ee8d7bbc9f1b389 /lib/libalpm/deps.h | |
parent | e515d89969ac7f8448a419b373530376ffe436bf (diff) | |
download | pacman-6c4d702cb10f9bc5da23b6511f09f4b4a07a4281.tar.xz |
Reorganize code for one-at-a-time resolving
This change reorganizes the internal code so that packages are
resolved one at a time instead of all at once from a list. This will
allow a future checkin to prompt the user to see if they'd rather
remove unresolvable packages from the transaction and continue, or
fail the transaction. This change does not affect the actual behavior
of libalpm and all tests pass without changes.
Signed-off-by: Bryan Ischo <bryan@ischo.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/deps.h')
-rw-r--r-- | lib/libalpm/deps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 2f3c4502..07270957 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -48,8 +48,8 @@ void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data); +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); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); |