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 1SiJzn-0000j8-Hh for garchives@archives.gentoo.org; Sat, 23 Jun 2012 06:39:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5BD0E0B81; Sat, 23 Jun 2012 06:38:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 876A4E0B81 for ; Sat, 23 Jun 2012 06:38:50 +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 2B4BB1B4002 for ; Sat, 23 Jun 2012 06:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EA63EE5435 for ; Sat, 23 Jun 2012 06:38:48 +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: <1340433515.f526e28f6151611a51a858c87ac2319e48f54e7f.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: f526e28f6151611a51a858c87ac2319e48f54e7f X-VCS-Branch: master Date: Sat, 23 Jun 2012 06:38:48 +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: d2f82604-8053-4d9d-ba1f-428067685114 X-Archives-Hash: f09b4e5e335f2e7b8951e20e6adeec05 commit: f526e28f6151611a51a858c87ac2319e48f54e7f Author: Zac Medico gentoo org> AuthorDate: Sat Jun 23 06:38:35 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 23 06:38:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df526e28f slot_abi_mask_built: fix __eq__ for backtracking --- 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 07d30e6..bdab7a6 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1007,9 +1007,9 @@ class depgraph(object): abi_masks =3D {} if new_child_slot is None: if not child.installed: - abi_masks.setdefault(child, {})["slot_abi_mask_built"] =3D dep + abi_masks.setdefault(child, {})["slot_abi_mask_built"] =3D None if not dep.parent.installed: - abi_masks.setdefault(dep.parent, {})["slot_abi_mask_built"] =3D dep + abi_masks.setdefault(dep.parent, {})["slot_abi_mask_built"] =3D None if abi_masks: config.setdefault("slot_abi_mask_built", {}).update(abi_masks) =20