diff options
| author | Allan McRae <allan@archlinux.org> | 2012-07-08 15:58:37 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-07-10 15:31:48 +0200 |
| commit | 44e9fdd0e848382337edb97d41e7317638a67bac (patch) | |
| tree | cfe064ec834c3d03cbe2a5f39b61f42231a480f6 /test | |
| parent | 717fdb8ee0fd23cf72fc7d2832317f513caefa2c (diff) | |
| download | pacman-44e9fdd0e848382337edb97d41e7317638a67bac.tar.gz pacman-44e9fdd0e848382337edb97d41e7317638a67bac.tar.xz | |
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 <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/fileconflict012.py | 17 |
1 files changed, 17 insertions, 0 deletions
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/") |