summaryrefslogtreecommitdiffstats
path: root/pym/portage/package
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-10-17 20:43:17 -0700
committerZac Medico <zmedico@gentoo.org>2012-10-17 20:43:17 -0700
commit5c48158a4af685e64d05a29fb54f43974c93ff3f (patch)
tree8b22d3bc85cf1c88e98f72981a1a1e3f4fe08e57 /pym/portage/package
parent5608e26193249acf4d072f7658f88ea7e7222ae4 (diff)
downloadportage-5c48158a4af685e64d05a29fb54f43974c93ff3f.tar.gz
portage-5c48158a4af685e64d05a29fb54f43974c93ff3f.tar.bz2
portage-5c48158a4af685e64d05a29fb54f43974c93ff3f.zip
doebuild: fix REPLACING_VERSIONS EAPI 5 sub-slot
Diffstat (limited to 'pym/portage/package')
-rw-r--r--pym/portage/package/ebuild/doebuild.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 650c3633a..0a1f1df0e 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -900,9 +900,8 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
else:
vardb = vartree.dbapi
cpv = mysettings.mycpv
- cp = portage.versions.cpv_getkey(cpv)
- slot = mysettings["SLOT"]
- cpv_slot = cp + ":" + slot
+ cpv_slot = "%s%s%s" % \
+ (cpv.cp, portage.dep._slot_separator, cpv.slot)
mysettings["REPLACING_VERSIONS"] = " ".join(
set(portage.versions.cpv_getversion(match) \
for match in vardb.match(cpv_slot) + \