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 1Pp1oF-0007tX-FY for garchives@archives.gentoo.org; Mon, 14 Feb 2011 17:01:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A983E0AF9; Mon, 14 Feb 2011 17:01:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 24ACCE0AF9 for ; Mon, 14 Feb 2011 17:01:51 +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 A48721B4042 for ; Mon, 14 Feb 2011 17:01:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0D30D8006A for ; Mon, 14 Feb 2011 17:01:50 +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: <091ebf260e1fa28134150dff957b6e873b6f2fae.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 091ebf260e1fa28134150dff957b6e873b6f2fae Date: Mon, 14 Feb 2011 17:01:50 +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: d4d1f44fb883e89fe3991f5737ade65a commit: 091ebf260e1fa28134150dff957b6e873b6f2fae Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 17:00:42 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 17:00:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D091ebf26 depgraph: fix virtual code to handle unsatisfied --- pym/_emerge/depgraph.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d83f8a8..7e55c77 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1307,7 +1307,7 @@ class depgraph(object): if not self._add_dep(dep, allow_unsatisfied=3Dallow_unsatisfied): return 0 - if is_virt: + if is_virt and dep.child is not None: traversed_virt_pkgs.add(dep.child) =20 selected_atoms.pop(pkg) @@ -1389,7 +1389,7 @@ class depgraph(object): if not self._add_dep(dep, allow_unsatisfied=3Dallow_unsatisfied): return 0 - if is_virt: + if is_virt and dep.child is not None: traversed_virt_pkgs.add(dep.child) =20 if debug: