summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-02 20:34:07 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-02 20:34:07 +0000
commit53e4843128571825ff9140248a5ac3e73ff760aa (patch)
treed76eae97cc944b331d00c23ef0e8d3d9f92bef1e
parenta1d1a7425077843862ce4954d9b75f8ad4a98cfc (diff)
downloadportage-53e4843128571825ff9140248a5ac3e73ff760aa.tar.gz
portage-53e4843128571825ff9140248a5ac3e73ff760aa.tar.bz2
portage-53e4843128571825ff9140248a5ac3e73ff760aa.zip
Make dep_getkey() recommend cpv_getkey() if given a cpv. (trunk r15380)
svn path=/main/branches/2.1.7/; revision=15607
-rw-r--r--pym/portage/dep.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index fe3f04f59..47da7cedb 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -937,9 +937,14 @@ def dep_getkey(mydep):
return Atom(mydep).cp
except InvalidAtom:
try:
- return Atom('=' + mydep).cp
+ atom = Atom('=' + mydep)
except InvalidAtom:
pass
+ else:
+ warnings.warn(_("invalid input to %s: '%s', use %s instead") % \
+ ('portage.dep.dep_getkey()', mydep, 'portage.cpv_getkey()'),
+ DeprecationWarning)
+ return atom.cp
# Fall back to legacy code for backward compatibility.
warnings.warn(_("%s is deprecated, use %s instead") % \