diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-07-17 18:42:10 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-07-17 18:42:10 -0700 |
commit | b5956d62d08882a8565d3ef98afa3a1d65090cb7 (patch) | |
tree | f02861752e458ef593b30ab157f9ee6b1626237d /pym/portage/dbapi/vartree.py | |
parent | 8657622137cbc88e161296b2f35d264e0f52dd45 (diff) | |
download | portage-b5956d62d08882a8565d3ef98afa3a1d65090cb7.tar.gz portage-b5956d62d08882a8565d3ef98afa3a1d65090cb7.tar.bz2 portage-b5956d62d08882a8565d3ef98afa3a1d65090cb7.zip |
portage.update: use isvalidatom for EAPI check
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
-rw-r--r-- | pym/portage/dbapi/vartree.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0ae7dc54b..ea62f6bcc 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -11,7 +11,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.data:portage_gid,portage_uid,secpass', 'portage.dbapi.dep_expand:dep_expand', 'portage.dbapi._MergeProcess:MergeProcess', - 'portage.dep:dep_getkey,isjustname,match_from_list,' + \ + 'portage.dep:dep_getkey,isjustname,isvalidatom,match_from_list,' + \ 'use_reduce,_get_slot_re', 'portage.eapi:_get_eapi_attrs', 'portage.elog:collect_ebuild_messages,collect_messages,' + \ @@ -332,10 +332,13 @@ class vardbapi(dbapi): if repo_match is not None \ 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]: + + # Use isvalidatom() to check if this move is valid for the + # EAPI (characters allowed in package names may vary). + if not isvalidatom(newcp, eapi=mycpv.eapi): continue - mynewcpv = mycpv.replace(mycpv_cp, str(newcp), 1) + + mynewcpv = mycpv.replace(mycpv_cp, _unicode(newcp), 1) mynewcat = catsplit(newcp)[0] origpath = self.getpath(mycpv) if not os.path.exists(origpath): |