Add a _pkg_str class to cache catpkgsplit results

[portage.git] / pym / portage / dep / __init__.py

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 2e3444de5819442aeda65ecd14eff1588119eb02..de8d1c4d13ff2f34d02b96f3c8f2ab62b8da7d05 100644 (file)
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -43,7 +43,7 @@ from portage.eapi import eapi_has_slot_deps, eapi_has_src_uri_arrows, \
 from portage.exception import InvalidAtom, InvalidData, InvalidDependString
 from portage.localization import _
 from portage.versions import catpkgsplit, catsplit, \
-       pkgcmp, vercmp, ververify, _cp, _cpv
+       pkgcmp, vercmp, ververify, _cp, _cpv, _pkg_str
 import portage.cache.mappings
 
 if sys.hexversion >= 0x3000000:
@@ -1137,7 +1137,11 @@ class Atom(_atom_base):
                else:
                        raise AssertionError(_("required group not found in atom: '%s'") % self)
                self.__dict__['cp'] = cp
-               self.__dict__['cpv'] = cpv
+               try:
+                       self.__dict__['cpv'] = _pkg_str(cpv)
+               except InvalidData:
+                       # plain cp, wildcard, or something
+                       self.__dict__['cpv'] = cpv
                self.__dict__['repo'] = repo
                self.__dict__['slot'] = slot
                self.__dict__['operator'] = op