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, 1 insertions, 0 deletions

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