Make cpv_getkey() use catpkgsplit() insead of a separate regex. (trunk r14628)

svn path=/main/branches/2.1.7/; revision=14656

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1b50b4cbb991601b8764589065ec0c4a1a6c85b7..ec6f5b96e9cf4b0f2ccbdf9d50a2b2a0dab90e37 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -8306,12 +8306,11 @@ def dep_wordreduce(mydeplist,mysettings,mydbapi,mode,use_cache=1):
                                        return None
        return deplist
 
-_cpv_key_re = re.compile('^' + versions._cpv + '$', re.VERBOSE)
 def cpv_getkey(mycpv):
        """Calls pkgsplit on a cpv and returns only the cp."""
-       m = _cpv_key_re.match(mycpv)
-       if m is not None:
-               return m.group(2)
+       mysplit = versions.catpkgsplit(mycpv)
+       if mysplit is not None:
+               return mysplit[0] + '/' + mysplit[1]
 
        warnings.warn("portage.cpv_getkey() called with invalid cpv: '%s'" \
                % (mycpv,), DeprecationWarning)