| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 22:03:56 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9638 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Prevent premature expansion of old-style virtuals |
| 9 |
inside depgraph.select_files(). (trunk r8306) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 21:54:51 UTC (rev 9637) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 22:03:56 UTC (rev 9638) |
| 16 |
@@ -1996,6 +1996,16 @@ |
| 17 |
portage.writemsg("!!! Please check ebuild(5) for full details.\n") |
| 18 |
portage.writemsg("!!! (Did you specify a version but forget to prefix with '='?)\n") |
| 19 |
return (0,[]) |
| 20 |
+ # Don't expand categories or old-style virtuals here unless |
| 21 |
+ # necessary. Expansion of old-style virtuals here causes at |
| 22 |
+ # least the following problems: |
| 23 |
+ # 1) It's more difficult to determine which set(s) an atom |
| 24 |
+ # came from, if any. |
| 25 |
+ # 2) It takes away freedom from the resolver to choose other |
| 26 |
+ # possible expansions when necessary. |
| 27 |
+ if "/" in x: |
| 28 |
+ arg_atoms.append((x, x)) |
| 29 |
+ continue |
| 30 |
try: |
| 31 |
mykey = None |
| 32 |
if "--usepkg" in self.myopts: |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives