index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Dan McGee <dan@archlinux.org> | 2008-01-14 00:59:11 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-01-21 19:44:10 -0600 |
commit | 9247ddbe8aaebf00bf9b93a753b73aa09b5de014 (patch) | |
tree | fa5c7bf537268b073ccd71024253728b7116d8f5 /lib/libalpm | |
parent | 36264a3ab9ec83ffe505dade32115a31e858122e (diff) |
-rw-r--r-- | lib/libalpm/conflict.c | 4 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index f666d595..37ced287 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -362,13 +362,13 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), numtargs, current); /* CHECK 1: check every target against every target */ + _alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s\n", + alpm_pkg_get_name(p1)); for(j = i->next; j; j = j->next) { p2 = j->data; if(!p2) { continue; } - _alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s and %s\n", - alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2)); if(tmpfiles) { |