| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | lib/libalpm/conflict.c | 1 | ||||
| -rw-r--r-- | lib/libalpm/filelist.c | 5 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index afef56cb..f087ace0 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -396,6 +396,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name); dbpkg = _alpm_db_get_pkgfromcache(handle->db_local, p1->name); + _alpm_filelist_resolve(handle, alpm_pkg_get_files(dbpkg)); /* Do two different checks here. If the package is currently installed, * then only check files that are new in the new package. If the package diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 233cfda4..dfcb15ea 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -217,9 +217,8 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA, while(ctrA < filesA->count && ctrB < filesB->count) { alpm_file_t *fileA = filesA->files + ctrA; - alpm_file_t *fileB = filesB->files + ctrB; - const char *strA = fileA->name; - const char *strB = fileB->name; + const char *strA = filesA->resolved_path[ctrA]; + const char *strB = filesB->resolved_path[ctrB]; /* skip directories, we don't care about them */ if(strA[strlen(strA)-1] == '/') { ctrA++; |