From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QF7OB-0006gs-1Y for garchives@archives.gentoo.org; Wed, 27 Apr 2011 16:14:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBDA21C03D; Wed, 27 Apr 2011 16:14:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8A7EF1C03D for ; Wed, 27 Apr 2011 16:14:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FC871B405D for ; Wed, 27 Apr 2011 16:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 73D6B80505 for ; Wed, 27 Apr 2011 16:14:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <37b0564dc8013f4495be59eb6af8dc9535c7c695.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 37b0564dc8013f4495be59eb6af8dc9535c7c695 Date: Wed, 27 Apr 2011 16:14:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 12713b594e3c0fc970d4328e3aaeff50 commit: 37b0564dc8013f4495be59eb6af8dc9535c7c695 Author: Zac Medico gentoo org> AuthorDate: Wed Apr 27 16:13:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 27 16:13:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D37b0564d expand_new_virt: don't traverse blockers --- pym/_emerge/actions.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 99619fa..59db58d 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1296,11 +1296,17 @@ def expand_new_virt(vardb, atom): or it does not match an installed package then it is yielded without any expansion. """ + if not isinstance(atom, Atom): + atom =3D Atom(atom) traversed =3D set() stack =3D [atom] =20 while stack: atom =3D stack.pop() + if atom.blocker: + yield atom + continue + matches =3D vardb.match(atom) if not (matches and matches[-1].startswith("virtual/")): yield atom