diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-03 21:22:48 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-03 21:22:48 +0100 |
| commit | fd2167131f84d35ada14e36be73ca6b266901acd (patch) | |
| tree | 6e0b4356be2fb4f9a0231af529f518136a09d01c /lib/libalpm/conflict.c | |
| parent | 0af3c4e85e5b35c049393c270f37853c4d443321 (diff) | |
| download | pacman-fd2167131f84d35ada14e36be73ca6b266901acd.tar.gz pacman-fd2167131f84d35ada14e36be73ca6b266901acd.tar.xz | |
* Remove unnecessary call to _alpm_trans_update_depends that was erroring
anyway.
* Spelling/commenting etc.
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |