| 1 |
commit: a60acb9f203f56af8225dc7dda7c453a12fd6372 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 7 11:11:08 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 7 11:11:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a60acb9f |
| 7 |
|
| 8 |
expand_new_virtuals: save atom unevaluated use |
| 9 |
|
| 10 |
This leads to a better unsatisfied USE message than the one reported |
| 11 |
in bug 353933, comment #3. TODO: Fix it so that these generated |
| 12 |
atoms don't break depgraph._get_dep_chain(), due to not being |
| 13 |
identical to the original atoms and therefore breaking |
| 14 |
extract_affecting_use(). |
| 15 |
|
| 16 |
--- |
| 17 |
pym/portage/dep/dep_check.py | 4 ++-- |
| 18 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 21 |
index cd740cd..3381af9 100644 |
| 22 |
--- a/pym/portage/dep/dep_check.py |
| 23 |
+++ b/pym/portage/dep/dep_check.py |
| 24 |
@@ -121,8 +121,8 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 25 |
a = [] |
| 26 |
for pkg in pkgs: |
| 27 |
virt_atom = '=' + pkg.cpv |
| 28 |
- if x.use: |
| 29 |
- virt_atom += str(x.use) |
| 30 |
+ if x.unevaluated_atom.use: |
| 31 |
+ virt_atom += str(x.unevaluated_atom.use) |
| 32 |
virt_atom = Atom(virt_atom) |
| 33 |
# According to GLEP 37, RDEPEND is the only dependency |
| 34 |
# type that is valid for new-style virtuals. Repoman |
Archives