| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | lib/libalpm/conflict.c | 15 | ||||
| -rw-r--r-- | test/pacman/tests/symlink021.py | 2 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 41b8393c..a70023b1 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -566,6 +566,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* localp2->files will be removed (target conflicts are handled by CHECK 1) */ if(localp2 && alpm_filelist_contains(alpm_pkg_get_files(localp2), relative_path)) { + size_t fslen = strlen(filestr); + /* skip removal of file, but not add. this will prevent a second * package from removing the file when it was already installed * by its new owner (whether the file is in backup array or not */ @@ -574,6 +576,19 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "file changed packages, adding to remove skiplist\n"); resolved_conflict = 1; + + if(filestr[fslen - 1] == '/') { + /* replacing a file with a directory: + * go ahead and skip any files inside filestr as they will + * necessarily be resolved by replacing the file with a dir + * NOTE: afterward, j will point to the last file inside filestr */ + for( ; j->next; j = j->next) { + const char *filestr2 = j->next->data; + if(strncmp(filestr, filestr2, fslen) != 0) { + break; + } + } + } } } diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py index 19a7f099..1ba7c025 100644 --- a/test/pacman/tests/symlink021.py +++ b/test/pacman/tests/symlink021.py @@ -24,5 +24,3 @@ self.addrule("FILE_TYPE=usr/include/foo|dir") self.addrule("!FILE_TYPE=usr/include/bar|link") self.addrule("FILE_EXIST=usr/include/foo/header.h") self.addrule("FILE_EXIST=usr/include/bar/header.h") - -self.expectfailure = True |