mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-11 20:05:07 -05:00
e3772f7654
The wrong test file was inadvertantly committed in 44e9fdd0. Add the
correct test and tidy up the test which was committed.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
18 lines
409 B
Python
18 lines
409 B
Python
self.description = "dir->file change during package upgrade (filesystem directory conflict)"
|
|
|
|
lp1 = pmpkg("pkg1")
|
|
lp1.files = ["dir/"]
|
|
self.addpkg2db("local", lp1)
|
|
|
|
self.filesystem = ["dir/conflict/"]
|
|
|
|
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/conflict/")
|