From b8c44536ca911418fee1c9ab4eecbb913a1ca852 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 11 Jun 2013 14:06:06 +0300 Subject: solver: rewrite as deductive solver -- core features Implementing basic dependency handling, install_if and awareness of pinning. --- src/cache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/cache.c') diff --git a/src/cache.c b/src/cache.c index f295f89..fc58f7e 100644 --- a/src/cache.c +++ b/src/cache.c @@ -34,7 +34,7 @@ static int cache_download(struct apk_database *db) char item[PATH_MAX], cacheitem[PATH_MAX]; int i, r, ret = 0; - r = apk_solver_solve(db, 0, db->world, NULL, &changeset); + r = apk_solver_solve(db, 0, db->world, &changeset); if (r < 0) { apk_error("Unable to select packages. Run apk fix."); return r; @@ -42,9 +42,8 @@ static int cache_download(struct apk_database *db) for (i = 0; i < changeset.changes->num; i++) { change = &changeset.changes->item[i]; - pkg = change->newpkg; - - if (pkg->repos & db->local_repos) + pkg = change->new_pkg; + if ((pkg == NULL) || (pkg->repos & db->local_repos)) continue; repo = apk_db_select_repo(db, pkg); -- cgit v1.2.3-60-g2f50