mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-10 11:35:00 -05:00
bfd6817112
When one package wants to replace a directory by a file, we check that all files in that directory were owned by that package. Additionally pacman can be more verbose when the extraction of the symlink (or file) fails. The patch to add.c looks more complex than it is, I just moved and reindented code to handle cases 10 and 11 together. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
25 lines
564 B
Python
25 lines
564 B
Python
self.description = "dir->symlink change during package upgrade (conflict)"
|
|
|
|
p1 = pmpkg("pkg1", "1.0-1")
|
|
p1.files = ["test/",
|
|
"test/file1",
|
|
"test/dir/file1",
|
|
"test/dir/file2"]
|
|
self.addpkg2db("local", p1)
|
|
|
|
p2 = pmpkg("pkg2")
|
|
p2.files = ["test/dir/file3"]
|
|
self.addpkg2db("local", p2)
|
|
|
|
p3 = pmpkg("pkg1", "2.0-1")
|
|
p3.files = ["test2/",
|
|
"test2/file3",
|
|
"test -> test2"]
|
|
self.addpkg2db("sync", p3)
|
|
|
|
self.args = "-S pkg1"
|
|
|
|
self.addrule("PACMAN_RETCODE=1")
|
|
self.addrule("PKG_EXIST=pkg1")
|
|
self.addrule("PKG_VERSION=pkg1|1.0-1")
|