From 948f135a73dec553b6e9983740b0e501f3a6e8c2 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 21 Jul 2012 00:17:18 +1000 Subject: 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 --- lib/libalpm/filelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/filelist.c') 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++; -- cgit v1.2.3-24-g4f1b