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 1Qft3E-0004qO-5t for garchives@archives.gentoo.org; Sun, 10 Jul 2011 12:23:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E90921C02D; Sun, 10 Jul 2011 12:23:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D238B21C02A for ; Sun, 10 Jul 2011 12:23:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45E672AC13D for ; Sun, 10 Jul 2011 12:23:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9FDE88003D for ; Sun, 10 Jul 2011 12:23: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: <0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/slot_collision.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86 Date: Sun, 10 Jul 2011 12:23: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: 3d7e17328cb4fdc4fc5f85c7629c6894 commit: 0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86 Author: Zac Medico gentoo org> AuthorDate: Sun Jul 10 12:05:58 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jul 10 12:05:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0dfe36c4 slot_collision: fix more for bug 374423 --- pym/_emerge/resolver/slot_collision.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolve= r/slot_collision.py index 0069d17..0df8f20 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -588,6 +588,15 @@ class slot_conflict_handler(object): else: violated_atom =3D atom.unevaluated_atom.violated_conditionals(_pkg_= use_enabled(pkg), \ pkg.iuse.is_valid_flag, parent_use=3D_pkg_use_enabled(ppkg)) + if violated_atom.use is None: + # It's possible for autounmask to change + # parent_use such that the unevaluated form + # of the atom now matches, even though the + # earlier evaluated form (from before + # autounmask changed parent_use) does not. + # In this case (see bug #374423), it's + # expected that violated_atom.use is None. + continue =20 if pkg.installed and (violated_atom.use.enabled or violated_atom.use= .disabled): #We can't change USE of an installed package (only of an ebuild, bu= t that is already