From 7d37d9278d0ab6eb46ec4689c8091780382cbb95 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Sun, 12 Aug 2007 22:26:54 +0200 Subject: Fix for sync1003 and sync1004 pactests checkdeps and resolvedeps now take both a remove list and an install list as arguments, allowing dependencies to be calculated correctly. This broke the sync990 pactest, but this pactest used dependencies and provides in an unusual way, so it has been changed. Dan: the sync990 pactest was just plain wrong. It didn't satisfy the dependencies correctly, so should never have succeeded. Signed-off-by: Chantry Xavier [Dan: some variable renaming, clarification in commit message] Signed-off-by: Dan McGee --- lib/libalpm/remove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/remove.c') diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index e1f19ec8..349ff10c 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -103,7 +103,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { _alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n"); - lp = _alpm_checkdeps(db, trans->type, trans->packages); + lp = alpm_checkdeps(db, 1, trans->packages, NULL); if(lp != NULL) { if(trans->flags & PM_TRANS_FLAG_CASCADE) { while(lp) { @@ -123,7 +123,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) } } FREELIST(lp); - lp = _alpm_checkdeps(db, trans->type, trans->packages); + lp = alpm_checkdeps(db, 1, trans->packages, NULL); } } else { if(data) { -- cgit v1.2.3-24-g4f1b