| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 21:16:11 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15399 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/sets/files.py |
| 7 |
Log: |
| 8 |
Use Atom.cp instead of dep_getkey. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/sets/files.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/sets/files.py 2010-02-19 21:12:23 UTC (rev 15398) |
| 14 |
+++ main/trunk/pym/portage/sets/files.py 2010-02-19 21:16:11 UTC (rev 15399) |
| 15 |
@@ -19,7 +19,7 @@ |
| 16 |
from portage.sets import SetConfigError, SETPREFIX, get_boolean |
| 17 |
from portage.env.loaders import ItemFileLoader, KeyListFileLoader |
| 18 |
from portage.env.validators import ValidAtomValidator |
| 19 |
-from portage import dep_getkey, cpv_getkey |
| 20 |
+from portage import cpv_getkey |
| 21 |
|
| 22 |
__all__ = ["StaticFileSet", "ConfigFileSet", "WorldSelectedSet"] |
| 23 |
|
| 24 |
@@ -305,7 +305,7 @@ |
| 25 |
mykey = cpv_getkey(cpv) |
| 26 |
newworldlist = [] |
| 27 |
for x in worldlist: |
| 28 |
- if dep_getkey(x) == mykey: |
| 29 |
+ if x.cp == mykey: |
| 30 |
matches = vardb.match(x, use_cache=0) |
| 31 |
if not matches: |
| 32 |
#zap our world entry |
Archives