| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-03 01:17:59 +0000 (Thu, 03 Apr 2008) |
| 3 |
New Revision: 9683 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In cpv_expand(), if the virtuals file contains a versioned atom (like |
| 9 |
the base profile currently has for virtual/pam), properly remove the |
| 10 |
operator and version from the atom before it is passed into |
| 11 |
dbapi.cp_list(). |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/__init__.py 2008-04-02 19:29:27 UTC (rev 9682) |
| 17 |
+++ main/trunk/pym/portage/__init__.py 2008-04-03 01:17:59 UTC (rev 9683) |
| 18 |
@@ -5680,7 +5680,11 @@ |
| 19 |
writemsg("virts[%s]: %s\n" % (str(mykey),virts[mykey]), 1) |
| 20 |
mykey_orig = mykey[:] |
| 21 |
for vkey in virts[mykey]: |
| 22 |
- if mydb.cp_list(vkey,use_cache=use_cache): |
| 23 |
+ # The virtuals file can contain a versioned atom, so |
| 24 |
+ # it may be necessary to remove the operator and |
| 25 |
+ # version from the atom before it is passed into |
| 26 |
+ # dbapi.cp_list(). |
| 27 |
+ if mydb.cp_list(dep_getkey(vkey), use_cache=use_cache): |
| 28 |
mykey = vkey |
| 29 |
writemsg("virts chosen: %s\n" % (mykey), 1) |
| 30 |
break |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives