From 836d4220d6d00b71bcf26bfd04a088f70cd71957 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 14 Sep 2009 06:02:36 +0000 Subject: Use the Atom class to implement dep_getkey(), and fall back to legacy code when necessary for backward compatibility. svn path=/main/trunk/; revision=14254 --- pym/portage/dep.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pym') diff --git a/pym/portage/dep.py b/pym/portage/dep.py index 847c76eae..8dbcdd657 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -995,6 +995,16 @@ def dep_getkey(mydep): cp = getattr(mydep, "cp", None) if cp is not None: return cp + + try: + return Atom(mydep).cp + except InvalidAtom: + try: + return Atom('=' + mydep).cp + except InvalidAtom: + pass + + # Fall back to legacy code for backward compatibility. mydep = dep_getcpv(mydep) if mydep and isspecific(mydep): mysplit = catpkgsplit(mydep) -- cgit v1.2.3-1-g7c22