diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-06-10 18:15:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-10 18:15:07 -0700 |
| commit | c864dd8d26ecc2144fd7e0ae56d12519f94dbd99 (patch) | |
| tree | 3f3a16da982e875c09bed6d870784b5764442641 /pym/portage/dbapi | |
| parent | Package: use _eapi_attrs (diff) | |
| download | portage-c864dd8d26ecc2144fd7e0ae56d12519f94dbd99.tar.gz portage-c864dd8d26ecc2144fd7e0ae56d12519f94dbd99.tar.bz2 portage-c864dd8d26ecc2144fd7e0ae56d12519f94dbd99.zip | |
Add a _get_slot_re() function.
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 517c873ab..fbbf49dcf 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -12,7 +12,8 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.dbapi.dep_expand:dep_expand', 'portage.dbapi._MergeProcess:MergeProcess', 'portage.dep:dep_getkey,isjustname,match_from_list,' + \ - 'use_reduce,_slot_re', + 'use_reduce,_get_slot_re', + 'portage.eapi:_get_eapi_attrs', 'portage.elog:collect_ebuild_messages,collect_messages,' + \ 'elog_process,_merge_logentries', 'portage.locks:lockdir,unlockdir,lockfile,unlockfile', @@ -687,7 +688,8 @@ class vardbapi(dbapi): (mydir_mtime, cache_data) self._aux_cache["modified"].add(mycpv) - if _slot_re.match(mydata['SLOT']) is None: + eapi_attrs = _get_eapi_attrs(mydata['EAPI']) + if _get_slot_re(eapi_attrs).match(mydata['SLOT']) is None: # Empty or invalid slot triggers InvalidAtom exceptions when # generating slot atoms for packages, so translate it to '0' here. mydata['SLOT'] = _unicode_decode('0') |