| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 09:43:36 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15380 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dep.py |
| 7 |
Log: |
| 8 |
Make dep_getkey() recommend cpv_getkey() if given a cpv. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/dep.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/dep.py 2010-02-19 09:32:44 UTC (rev 15379) |
| 14 |
+++ main/trunk/pym/portage/dep.py 2010-02-19 09:43:36 UTC (rev 15380) |
| 15 |
@@ -937,9 +937,14 @@ |
| 16 |
return Atom(mydep).cp |
| 17 |
except InvalidAtom: |
| 18 |
try: |
| 19 |
- return Atom('=' + mydep).cp |
| 20 |
+ atom = Atom('=' + mydep) |
| 21 |
except InvalidAtom: |
| 22 |
pass |
| 23 |
+ else: |
| 24 |
+ warnings.warn(_("invalid input to %s: '%s', use %s instead") % \ |
| 25 |
+ ('portage.dep.dep_getkey()', mydep, 'portage.cpv_getkey()'), |
| 26 |
+ DeprecationWarning) |
| 27 |
+ return atom.cp |
| 28 |
|
| 29 |
# Fall back to legacy code for backward compatibility. |
| 30 |
warnings.warn(_("%s is deprecated, use %s instead") % \ |
Archives