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 1SjGq5-0002yL-Np for garchives@archives.gentoo.org; Mon, 25 Jun 2012 21:28:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A427121C185; Mon, 25 Jun 2012 21:28:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 749EE21C185 for ; Mon, 25 Jun 2012 21:28:45 +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 AE2AC1B44C9 for ; Mon, 25 Jun 2012 21:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 79330E5432 for ; Mon, 25 Jun 2012 21:28:42 +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: <1340659711.21ef745c11538e294f0946f2a40812971652b40c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/_slot_abi.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 21ef745c11538e294f0946f2a40812971652b40c X-VCS-Branch: master Date: Mon, 25 Jun 2012 21:28:42 +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: 0285c028-4b9b-4c98-b7c4-e07be1428156 X-Archives-Hash: b2c91224efa2001445b80d64346d46b2 commit: 21ef745c11538e294f0946f2a40812971652b40c Author: Zac Medico gentoo org> AuthorDate: Mon Jun 25 21:28:31 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 25 21:28:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D21ef745c _slot_abi: fix broken function refs --- pym/portage/dep/_slot_abi.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/dep/_slot_abi.py b/pym/portage/dep/_slot_abi.py index 3282caf..7c36e52 100644 --- a/pym/portage/dep/_slot_abi.py +++ b/pym/portage/dep/_slot_abi.py @@ -20,7 +20,7 @@ def find_built_slot_abi_atoms(pkg): def _find_built_slot_abi_op(dep_struct): for x in dep_struct: if isinstance(x, list): - for atom in _find_slot_abi_equal_op(x): + for atom in _find_built_slot_abi_op(x): yield atom elif isinstance(x, Atom) and x.slot_abi_built: yield x @@ -28,7 +28,7 @@ def _find_built_slot_abi_op(dep_struct): def ignore_built_slot_abi_deps(dep_struct): for i, x in enumerate(dep_struct): if isinstance(x, list): - ignore_slot_abi_equal_deps(x) + ignore_built_slot_abi_deps(x) elif isinstance(x, Atom) and x.slot_abi_built: # There's no way of knowing here whether the SLOT # part of the SLOT/ABI pair should be kept, so we