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 <gentoo-commits+bounces-431557-garchives=archives.gentoo.org@lists.gentoo.org>) id 1S137T-0006bh-7z for garchives@archives.gentoo.org; Fri, 24 Feb 2012 21:56:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DBDBE0D7A; Fri, 24 Feb 2012 21:55:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 20EF9E0D7A for <gentoo-commits@lists.gentoo.org>; Fri, 24 Feb 2012 21:55:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87D6A1B4020 for <gentoo-commits@lists.gentoo.org>; Fri, 24 Feb 2012 21:55:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4943AE53FF for <gentoo-commits@lists.gentoo.org>; Fri, 24 Feb 2012 21:55:49 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1330120401.0279590c2351cf4e757e15bbbfc5546205e16533.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: 0279590c2351cf4e757e15bbbfc5546205e16533 X-VCS-Branch: master Date: Fri, 24 Feb 2012 21:55:49 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2bb35d46-9b9b-43a5-8e4c-5e80bb40d09d X-Archives-Hash: 3c5589619e26b29ce966ee65c49411aa commit: 0279590c2351cf4e757e15bbbfc5546205e16533 Author: Sebastian Luther <SebastianLuther <AT> gmx <DOT> de> AuthorDate: Fri Feb 24 21:13:52 2012 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Feb 24 21:53:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0279590c autounmask: Fix USE change messages to display the correct parent Fixes bug 399863. --- pym/_emerge/depgraph.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index cdc5098..bb3bf4a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2814,6 +2814,10 @@ class depgraph(object): elif node is not start_node: for ppkg, patom in all_parents[child]: if ppkg =3D=3D node: + if child is start_node and unsatisfied_dependency and \ + InternalPackageSet(initial_atoms=3D(patom,)).findAtomForPackage(c= hild): + # This atom is satisfied by child, there must be another atom. + continue atom =3D patom.unevaluated_atom break =20