From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 8 Jul 2012 23:58:37 +1000 Subject: Check empty subdirectory ownership When checking if a package owns a directory, it is important to check not only that all the files in the directory are part of the package, but also if the directory is part of a package. This catches empty subdirectories during conflict checking for directory to file/symlink replacements. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 test/pacman/tests/fileconflict012.py (limited to 'test') diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py new file mode 100644 index 00000000..421b739a --- /dev/null +++ b/test/pacman/tests/fileconflict012.py @@ -0,0 +1,17 @@ +self.description = "dir->file change during package upgrade (filesystem file conflict)" + +lp1 = pmpkg("pkg1") +lp1.files = ["dir/"] +self.addpkg2db("local", lp1) + +self.filesystem = ["dir/file"] + +p = pmpkg("pkg1", "1.0-2") +p.files = ["dir"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("DIR_EXIST=dir/") -- cgit v1.2.3-70-g09d2