From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B8AC138010 for ; Thu, 18 Oct 2012 03:02:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA768E0441; Thu, 18 Oct 2012 03:02:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3AEC4E0453 for ; Thu, 18 Oct 2012 03:02:37 +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 9BEA633D383 for ; Thu, 18 Oct 2012 03:02:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 482B0E5436 for ; Thu, 18 Oct 2012 03:02:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1350529346.eae98cf5e150d0c65ed2d7f55bf0f4d01b3dfdbb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/_sets/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/_sets/files.py X-VCS-Directories: pym/portage/_sets/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: eae98cf5e150d0c65ed2d7f55bf0f4d01b3dfdbb X-VCS-Branch: master Date: Thu, 18 Oct 2012 03:02:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a2e10eb5-09bd-48cc-b825-4e4cb6b0b74b X-Archives-Hash: 51c35305e74a2f7e01d75391d759f58c commit: eae98cf5e150d0c65ed2d7f55bf0f4d01b3dfdbb Author: Zac Medico gentoo org> AuthorDate: Thu Oct 18 03:02:26 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 18 03:02:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eae98cf5 StaticFileSet: fix for EAPI 5 sub-slot in SLOT --- pym/portage/_sets/files.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py index b891ea4..b839582 100644 --- a/pym/portage/_sets/files.py +++ b/pym/portage/_sets/files.py @@ -86,8 +86,8 @@ class StaticFileSet(EditablePackageSet): for a in data: matches = self.dbapi.match(a) for cpv in matches: - atoms.append("%s:%s" % (cpv_getkey(cpv), - self.dbapi.aux_get(cpv, ["SLOT"])[0])) + pkg = self.dbapi._pkg_str(cpv, None) + atoms.append("%s:%s" % (pkg.cp, pkg.slot)) # In addition to any installed slots, also try to pull # in the latest new slot that may be available. atoms.append(a)