diff options
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 8417348a..4f96ad9a 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -384,7 +384,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *i, *conflicts = NULL; size_t numtargs = alpm_list_count(upgrade); size_t current; - alpm_trans_t *trans = handle->trans; if(!upgrade) { return NULL; @@ -402,7 +401,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, size_t filenum; int percent = (current * 100) / numtargs; - PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent, + PROGRESS(handle, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent, numtargs, current); /* CHECK 1: check every target against every target */ _alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n", @@ -585,7 +584,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, free(tmpfiles.files); } } - PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, + PROGRESS(handle, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); return conflicts; |