bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conflict: skip dir children when replacing a file

Browse source 
When replacing a file with a directory, any files under that directory
do not need to be checked for conflicts.  This prevents possible
false-positive conflicts where the file being replaced is a symlink.

We were already skipping the directory children when the file was owned
by the previous version of a package being upgraded.  This extends that
to other packages being removed.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2017-01-03 02:06:22 -05:00 • committed by Allan McRae
parent 8a19c4a782
commit b6753eeb7e
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/libalpm/conflict.c
View file

@ -503,6 +503,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
struct stat lsbuf; struct stat lsbuf;
char path[PATH_MAX]; char path[PATH_MAX];
size_t pathlen; size_t pathlen;
int pfile_isdir;
pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr);
relative_path = path + rootlen; relative_path = path + rootlen;
@ -514,7 +515,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path); _alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);
if(path[pathlen - 1] == '/') { pfile_isdir = path[pathlen - 1] == '/';
if(pfile_isdir) {
if(S_ISDIR(lsbuf.st_mode)) { if(S_ISDIR(lsbuf.st_mode)) {
_alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n");
continue; continue;
@ -551,6 +553,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
_alpm_log(handle, ALPM_LOG_DEBUG, _alpm_log(handle, ALPM_LOG_DEBUG,
"local file will be removed, not a conflict\n"); "local file will be removed, not a conflict\n");
resolved_conflict = 1; resolved_conflict = 1;
if(pfile_isdir) {
/* 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 */
size_t fslen = strlen(filestr);
for( ; j->next; j = j->next) {
const char *filestr2 = j->next->data;
if(strncmp(filestr, filestr2, fslen) != 0) {
break;
}
}
}
} }
} }

1
test/pacman/tests/TESTS
View file

@ -150,6 +150,7 @@ TESTS += test/pacman/tests/smoke001.py
TESTS += test/pacman/tests/smoke002.py TESTS += test/pacman/tests/smoke002.py
TESTS += test/pacman/tests/smoke003.py TESTS += test/pacman/tests/smoke003.py
TESTS += test/pacman/tests/smoke004.py TESTS += test/pacman/tests/smoke004.py
TESTS += test/pacman/tests/symlink-replace-with-dir.py
TESTS += test/pacman/tests/symlink001.py TESTS += test/pacman/tests/symlink001.py
TESTS += test/pacman/tests/symlink002.py TESTS += test/pacman/tests/symlink002.py
TESTS += test/pacman/tests/symlink010.py TESTS += test/pacman/tests/symlink010.py

18
test/pacman/tests/symlink-replace-with-dir.py Normal file
View file

@ -0,0 +1,18 @@
self.description = "incoming package replaces symlink with directory"
lp = pmpkg("pkg1")
lp.files = ["usr/lib/foo",
"lib -> usr/lib"]
self.addpkg2db("local", lp)
p1 = pmpkg("pkg2")
p1.files = ["lib/foo"]
p1.conflicts = ["pkg1"]
self.addpkg2db("sync", p1)
self.args = "-S pkg2 --ask=4"
self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
self.addrule("FILE_TYPE=lib|dir")