From fd2167131f84d35ada14e36be73ca6b266901acd Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Mar 2007 20:22:48 +0000 Subject: * Remove unnecessary call to _alpm_trans_update_depends that was erroring anyway. * Spelling/commenting etc. --- lib/libalpm/conflict.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 96c0ac84..76e76901 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -244,11 +244,13 @@ alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages) continue; } + /* run three different conflict checks on each package */ baddeps = chk_pkg_vs_db(baddeps, pkg, db); baddeps = chk_pkg_vs_targets(baddeps, pkg, db, packages); baddeps = chk_db_vs_targets(baddeps, pkg, db, packages); } + /* debug loop */ for(i = baddeps; i; i = i->next) { pmdepmissing_t *miss = i->data; _alpm_log(PM_LOG_DEBUG, _("\tCONFLICTS:: %s conflicts with %s"), miss->target, miss->depend.name); -- cgit v1.2.3-24-g4f1b