diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2016-12-17 16:02:18 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2017-01-04 04:59:15 +0100 |
| commit | 9c3bf2988f565be66c57c6eee242e6f61e4921e4 (patch) | |
| tree | dcb58785afc740bf4a202ffdf945b3ea6d4f885e /lib/libalpm | |
| parent | b6753eeb7ead3fa7bfdb053babe877319a722115 (diff) | |
| download | pacman-9c3bf2988f565be66c57c6eee242e6f61e4921e4.tar.gz pacman-9c3bf2988f565be66c57c6eee242e6f61e4921e4.tar.xz | |
find_fileconflicts: rename tmpfiles -> newfiles
The files belong to the new version of a package being installed, they
are not temporary in any way.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/conflict.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 878cfb94..b1666dfe 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -419,7 +419,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(current = 0, i = upgrade; i; i = i->next, current++) { alpm_pkg_t *p1 = i->data; alpm_list_t *j; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *newfiles = NULL; alpm_pkg_t *dbpkg; int percent = (current * 100) / numtargs; @@ -483,18 +483,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * be freed. */ if(dbpkg) { /* older ver of package currently installed */ - tmpfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), + newfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg)); } else { /* no version of package currently installed */ alpm_filelist_t *fl = alpm_pkg_get_files(p1); size_t filenum; for(filenum = 0; filenum < fl->count; filenum++) { - tmpfiles = alpm_list_add(tmpfiles, fl->files[filenum].name); + newfiles = alpm_list_add(newfiles, fl->files[filenum].name); } } - for(j = tmpfiles; j; j = j->next) { + for(j = newfiles; j; j = j->next) { const char *filestr = j->data; const char *relative_path; alpm_list_t *k; @@ -667,12 +667,12 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); return NULL; } } } - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); } PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); |