aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-07-17 16:52:48 -0700
committerZac Medico <zmedico@gentoo.org>2012-07-17 16:52:48 -0700
commit2df06cb95c1f97a470034bf2be73869256633685 (patch)
treed8f14ef8c5aa81e8def6ac7de87da73fac3ce75a /pym/portage/dbapi/bintree.py
parentPropagate EAPI for update_dbentry (bug #426476). (diff)
downloadportage-2df06cb95c1f97a470034bf2be73869256633685.tar.gz
portage-2df06cb95c1f97a470034bf2be73869256633685.tar.bz2
portage-2df06cb95c1f97a470034bf2be73869256633685.zip
move: respect EAPI wrt dots_in_PN, bug #426476
Diffstat (limited to 'pym/portage/dbapi/bintree.py')
-rw-r--r--pym/portage/dbapi/bintree.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index e3de50f08..8072542e8 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -8,6 +8,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.checksum:hashfunc_map,perform_multiple_checksums,verify_all',
'portage.dbapi.dep_expand:dep_expand',
'portage.dep:dep_getkey,isjustname,match_from_list',
+ 'portage.eapi:_get_eapi_attrs',
'portage.output:EOutput,colorize',
'portage.locks:lockfile,unlockfile',
'portage.package.ebuild.fetch:_check_distfile,_hide_url_passwd',
@@ -386,8 +387,10 @@ class binarytree(object):
# Ignore PROVIDE virtual match.
continue
if repo_match is not None \
- and not repo_match(self.dbapi.aux_get(mycpv,
- ['repository'])[0]):
+ and not repo_match(mycpv.repo):
+ continue
+ eapi_attrs = _get_eapi_attrs(mycpv.eapi)
+ if not eapi_attrs.dots_in_PN and "." in catsplit(newcp)[1]:
continue
mynewcpv = mycpv.replace(mycpv_cp, str(newcp), 1)
myoldpkg = catsplit(mycpv)[1]