Resolve file paths during inter-package conflict check

File paths are resolved if necessary during inter-package conflict
checks so that packages carrying the same effective file due to
directory symlinks on the filesystem are flagged as conflicting.

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index ccfe990c..afef56cb 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -361,12 +361,17 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 		int percent = (current * 100) / numtargs;
 		PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", percent,
 		         numtargs, current);
+
+		_alpm_filelist_resolve(handle, alpm_pkg_get_files(p1));
+
 		/* CHECK 1: check every target against every target */
 		_alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n",
 				p1->name);
 		for(j = i->next; j; j = j->next) {
 			alpm_list_t *common_files;
 			alpm_pkg_t *p2 = j->data;
+			_alpm_filelist_resolve(handle, alpm_pkg_get_files(p2));
+
 			common_files = _alpm_filelist_intersection(alpm_pkg_get_files(p1),
 					alpm_pkg_get_files(p2));