mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-24 08:48:50 -05:00
34749e177d
Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae <allan@archlinux.org>
32 lines
748 B
Python
32 lines
748 B
Python
self.description = "File relocation between two packages (reverse order, --force)"
|
|
|
|
lp1 = pmpkg("dummy")
|
|
lp1.files = ["bin/dummy"]
|
|
|
|
lp2 = pmpkg("foobar")
|
|
lp2.files = ["bin/foobar",
|
|
"usr/share/file"]
|
|
|
|
for p in lp1, lp2:
|
|
self.addpkg2db("local", p)
|
|
|
|
p1 = pmpkg("dummy")
|
|
p1.files = ["bin/dummy",
|
|
"usr/share/file"]
|
|
|
|
p2 = pmpkg("foobar")
|
|
p2.files = ["bin/foobar"]
|
|
|
|
for p in p1, p2:
|
|
self.addpkg(p)
|
|
|
|
self.args = "-U --force %s" % " ".join([p.filename() for p in p1, p2])
|
|
|
|
self.addrule("PACMAN_RETCODE=0")
|
|
for p in p1, p2:
|
|
self.addrule("PKG_EXIST=%s" % p.name)
|
|
self.addrule("FILE_MODIFIED=bin/dummy")
|
|
self.addrule("FILE_MODIFIED=bin/foobar")
|
|
self.addrule("FILE_EXIST=usr/share/file")
|
|
self.addrule("FILE_MODIFIED=usr/share/file")
|