* Writing 'replaces' info to both /desc and /depends files for testing - see the
"replaces confusion" thread on pacman-dev for more information * Cleaned up some 2 item loops in the sync131 test
This commit is contained in:
parent
25223d6790
commit
52376150fa
2 changed files with 7 additions and 6 deletions
|
@ -251,6 +251,8 @@ class pmdb:
|
||||||
if pkg.reason:
|
if pkg.reason:
|
||||||
data.append(_mksection("REASON", pkg.reason))
|
data.append(_mksection("REASON", pkg.reason))
|
||||||
else:
|
else:
|
||||||
|
if pkg.replaces:
|
||||||
|
data.append(_mksection("REPLACES", pkg.replaces))
|
||||||
if pkg.csize:
|
if pkg.csize:
|
||||||
data.append(_mksection("CSIZE", pkg.csize))
|
data.append(_mksection("CSIZE", pkg.csize))
|
||||||
if pkg.md5sum:
|
if pkg.md5sum:
|
||||||
|
|
|
@ -2,18 +2,17 @@ self.description = "Sysupgrade with a sync package replacing a set of local ones
|
||||||
|
|
||||||
sp = pmpkg("pkg4")
|
sp = pmpkg("pkg4")
|
||||||
sp.replaces = ["pkg1", "pkg2", "pkg3"]
|
sp.replaces = ["pkg1", "pkg2", "pkg3"]
|
||||||
|
|
||||||
self.addpkg2db("sync", sp)
|
self.addpkg2db("sync", sp)
|
||||||
|
|
||||||
lp1 = pmpkg("pkg1")
|
lp1 = pmpkg("pkg1")
|
||||||
lp2 = pmpkg("pkg2")
|
self.addpkg2db("local", lp1)
|
||||||
|
|
||||||
for p in lp1, lp2:
|
lp2 = pmpkg("pkg2")
|
||||||
self.addpkg2db("local", p)
|
self.addpkg2db("local", lp2)
|
||||||
|
|
||||||
self.args = "-Su"
|
self.args = "-Su"
|
||||||
|
|
||||||
self.addrule("PACMAN_RETCODE=0")
|
self.addrule("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=pkg4")
|
self.addrule("PKG_EXIST=pkg4")
|
||||||
for p in lp1, lp2:
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
self.addrule("!PKG_EXIST=%s" % p.name)
|
self.addrule("!PKG_EXIST=pkg2")
|
||||||
|
|
Loading…
Add table
Reference in a new issue