diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-07-19 16:54:12 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-07-20 10:13:42 -0500 |
| commit | 45f90de0eb9c33eee0deb63bae9aabe5988b8733 (patch) | |
| tree | 143ca05d6860abb0c1a38be5ca882495f171da49 /lib | |
| parent | bfd6817112b34b552e9139bdc582d048bcba38b9 (diff) | |
Fix klibc conflict case.
A package can now replace symdir->dir by dir without fileconflicts.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/conflict.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index c4c57cb0..a6d50d4f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -531,6 +531,19 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, free(dir); } + if(!resolved_conflict && dbpkg) { + char *rpath = calloc(PATH_MAX+1, sizeof(char)); + if(!realpath(path, rpath)) { + free(rpath); + continue; + } + char *filestr = rpath + strlen(handle->root); + if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) { + resolved_conflict = 1; + } + free(rpath); + } + if(!resolved_conflict) { _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, |