From 8a373096f590925465f624d7b0bf466b02143ce1 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 4 Dec 2015 07:36:01 +1000 Subject: 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 --- test/pacman/tests/TESTS | 1 + test/pacman/tests/symlink021.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 test/pacman/tests/symlink021.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index e330896b..bee7c8ec 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/symlink010.py TESTS += test/pacman/tests/symlink011.py TESTS += test/pacman/tests/symlink012.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-nodepversion01.py TESTS += test/pacman/tests/sync-nodepversion02.py diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py new file mode 100644 index 00000000..19a7f099 --- /dev/null +++ b/test/pacman/tests/symlink021.py @@ -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 -- cgit v1.2.3-70-g09d2