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 1QPTxS-0003Bz-6B for garchives@archives.gentoo.org; Thu, 26 May 2011 06:22:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34B211C4F5; Thu, 26 May 2011 06:18:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 00E5B1C4F5 for ; Thu, 26 May 2011 06:18:32 +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 C00B01B400D for ; Thu, 26 May 2011 06:18:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2FB908001B for ; Thu, 26 May 2011 06:18:32 +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: <70d7c4449cc39f522987a6134440432ba95ab8bf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 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: 70d7c4449cc39f522987a6134440432ba95ab8bf Date: Thu, 26 May 2011 06:18:32 +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: 3d3d8b2db85702835df047c499f8e6b3 commit: 70d7c4449cc39f522987a6134440432ba95ab8bf Author: Zac Medico gentoo org> AuthorDate: Wed May 18 04:37:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 26 03:16:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D70d7c444 _pkg_visibility_check: if in graph then visible --- pym/_emerge/depgraph.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2d0ad82..e6f9b12 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3023,7 +3023,16 @@ class depgraph(object): if pkg.visible: return True =20 - if self._frozen_config.myopts.get('--autounmask', 'n') is not True: + if pkg in self._dynamic_config.digraph: + # Sometimes we need to temporarily disable + # dynamic_config._autounmask, but for overall + # consistency in dependency resolution, in any + # case we want to respect autounmask visibity + # for packages that have already been added to + # the dependency graph. + return True + + if not self._dynamic_config._autounmask: return False =20 pkgsettings =3D self._frozen_config.pkgsettings[pkg.root]