public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dep/
Date: Tue,  8 Feb 2011 00:54:21 +0000 (UTC)	[thread overview]
Message-ID: <7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.zmedico@gentoo> (raw)

commit:     7f2874ee2366a1a94534e9b3d97bd2f43573d4d4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 22:19:33 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 00:53:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7f2874ee

expand_new_virtuals: fix last commit USE handling

---
 pym/portage/dep/dep_check.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 60896c0..9373ecb 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -124,8 +124,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 			if x.unevaluated_atom.use:
 				virt_atom += str(x.unevaluated_atom.use)
 				virt_atom = Atom(virt_atom)
-				virt_atom = virt_atom.evaluate_conditionals(
-					pkg_use_enabled(graph_parent))
+				if graph_parent is None:
+					virt_atom = virt_atom.evaluate_conditionals(myuse)
+				else:
+					virt_atom = virt_atom.evaluate_conditionals(
+						pkg_use_enabled(graph_parent))
 			else:
 				virt_atom = Atom(virt_atom)
 			# According to GLEP 37, RDEPEND is the only dependency



             reply	other threads:[~2011-02-08  0:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-08  0:54 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-04-13  7:52 [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dep/ Zac Medico
2011-03-18 21:12 Zac Medico
2011-02-20  0:04 Zac Medico
2011-02-08 20:48 Zac Medico
2011-02-08  0:54 Zac Medico
2011-02-08  0:54 Zac Medico
2011-02-08  0:54 Zac Medico
2011-02-05  0:59 Zac Medico
2011-02-05  0:59 Zac Medico
2011-02-04  6:33 zmedico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox