| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-03 21:20:22 +0000 (Mon, 03 Aug 2009) |
| 3 |
New Revision: 13881 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Bug #278729 - Inside dep_zapdeps(), ignore USE dependencies since we don't |
| 9 |
want USE settings to adversely affect || preference evaluation. Drop invalid |
| 10 |
atoms inside _expand_new_virtuals() since we only want real Atom instances |
| 11 |
inside dep_zapdeps(). |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/__init__.py 2009-08-03 20:49:09 UTC (rev 13880) |
| 17 |
+++ main/trunk/pym/portage/__init__.py 2009-08-03 21:20:22 UTC (rev 13881) |
| 18 |
@@ -6918,6 +6918,9 @@ |
| 19 |
if portage.dep._dep_check_strict: |
| 20 |
raise portage.exception.ParseError( |
| 21 |
"invalid atom: '%s'" % x) |
| 22 |
+ else: |
| 23 |
+ # Only real Atom instances are allowed past this point. |
| 24 |
+ continue |
| 25 |
else: |
| 26 |
if x.blocker and x.blocker.overlap.forbid and \ |
| 27 |
eapi in ("0", "1") and portage.dep._dep_check_strict: |
| 28 |
@@ -7139,7 +7142,9 @@ |
| 29 |
for atom in atoms: |
| 30 |
if atom[:1] == "!": |
| 31 |
continue |
| 32 |
- avail_pkg = mydbapi.match(atom) |
| 33 |
+ # Ignore USE dependencies here since we don't want USE |
| 34 |
+ # settings to adversely affect || preference evaluation. |
| 35 |
+ avail_pkg = mydbapi.match(atom.without_use) |
| 36 |
if avail_pkg: |
| 37 |
avail_pkg = avail_pkg[-1] # highest (ascending order) |
| 38 |
avail_slot = "%s:%s" % (dep_getkey(atom), |
Archives