mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-16 06:15:08 -05:00
a71f4c4c6a
The previous fileconflict check (package vs filesystem) skipped the conflict when the file on the filesystem was a directory or a symlink to a directory, no matter what the file in the package was. Now, the conflict will only be skipped if the file in the package is a directory (so compatible with a dir or a dir symlink on the filesystem). So in the case of 8156 (new fileconflict003 pactest for this case), instead of silently ignoring the extraction of the test symlink, pacman will now fail because of a file conflict between the test symlink in the pkg2 package and the test directory on the filesystem. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
19 lines
368 B
Python
19 lines
368 B
Python
self.description = "FS#8156"
|
|
|
|
p1 = pmpkg("pkg1")
|
|
p1.files = ["test/",
|
|
"test/file"]
|
|
self.addpkg2db("local", p1)
|
|
|
|
p2 = pmpkg("pkg2")
|
|
p2.files = ["test2/",
|
|
"test2/file2",
|
|
"test -> test2"]
|
|
self.addpkg2db("sync", p2)
|
|
|
|
self.args = "-S pkg2"
|
|
|
|
self.addrule("PACMAN_RETCODE=1")
|
|
self.addrule("PKG_EXIST=pkg1")
|
|
self.addrule("!PKG_EXIST=pkg2")
|