1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00

Detect potential conflict when symlink to directory is changing to directory

When a symlink to a directory is changing to a directory, any package file
inside the new directory can create an unexpected conflict with the filesystem.

Reported by Neofytos and Luca from Chakra.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-12-04 07:36:01 +10:00
parent 088649534e
commit 8a373096f5
2 changed files with 29 additions and 0 deletions

View File

@ -150,6 +150,7 @@ TESTS += test/pacman/tests/symlink010.py
TESTS += test/pacman/tests/symlink011.py TESTS += test/pacman/tests/symlink011.py
TESTS += test/pacman/tests/symlink012.py TESTS += test/pacman/tests/symlink012.py
TESTS += test/pacman/tests/symlink020.py TESTS += test/pacman/tests/symlink020.py
TESTS += test/pacman/tests/symlink021.py
TESTS += test/pacman/tests/sync-install-assumeinstalled.py TESTS += test/pacman/tests/sync-install-assumeinstalled.py
TESTS += test/pacman/tests/sync-nodepversion01.py TESTS += test/pacman/tests/sync-nodepversion01.py
TESTS += test/pacman/tests/sync-nodepversion02.py TESTS += test/pacman/tests/sync-nodepversion02.py

View File

@ -0,0 +1,28 @@
self.description = "symlink -> dir replacment with file move"
lp1 = pmpkg("pkg1")
lp1.files = ["usr/include/foo/",
"usr/include/bar -> foo",
"usr/include/foo/header.h"]
self.addpkg2db("local", lp1)
sp1 = pmpkg("pkg1", "1.0-2")
sp1.files = ["usr/include/foo/",
"usr/include/foo/header.h"]
self.addpkg2db("sync", sp1)
sp2 = pmpkg("pkg2", "1.0-2")
sp2.files = ["usr/include/bar/",
"usr/include/bar/header.h"]
self.addpkg2db("sync", sp2)
self.args = "-S %s %s" % (sp1.name, sp2.name)
self.addrule("PACMAN_RETCODE=0")
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