moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid upgrade conflict with unchanged effective path 

This applies to a case such as when /lib is a symlink to /usr/lib. If a
package is installed which contains /lib/libfoo.so, pacman will complain
if this package is then "fixed" to contain /usr/lib/libfoo.so. Since
these have the same effective path and it exists within the same
package, ignore the conflict.

Fixes FS#30681.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-07-21 00:17:18 +10:00
parent 88e7ea421e
commit 948f135a73
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/conflict.c
View File

@ -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

5
lib/libalpm/filelist.c
View File

@ -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++;

2
test/pacman/tests/fileconflict013.py
View File

@ -18,5 +18,3 @@
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.expectfailure = True