mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-01 16:15:04 -04:00
fbf3beb8d2
If the end of the pB list was reached before the end of pA, we failed to read any remaining files from the pA list. Add an additional loop to ensure all entries of pA are added to the return list regardless of whether we have reached the end of pB. This new loop also eliminates the now-unnecessary check for a null pB, as we need to ensure we are excluding directories in the resulting output anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
17 lines
383 B
Python
17 lines
383 B
Python
self.description = "Upgrade a package with a filesystem conflict"
|
|
|
|
p = pmpkg("dummy", "2.0-1")
|
|
p.files = ["bin/dummy", "usr/share/file"]
|
|
self.addpkg(p)
|
|
|
|
lp = pmpkg("dummy", "1.0-1")
|
|
lp.files = ["bin/dummy"]
|
|
self.addpkg2db("local", lp)
|
|
|
|
self.filesystem = ["usr/share/file"]
|
|
|
|
self.args = "-U %s" % p.filename()
|
|
|
|
self.addrule("PACMAN_RETCODE=1")
|
|
self.addrule("PKG_VERSION=dummy|1.0-1")
|