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>

1 files changed, 2 insertions, 3 deletions

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