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 1Qm0oV-0004sn-82 for garchives@archives.gentoo.org; Wed, 27 Jul 2011 09:54:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEC0021C17E; Wed, 27 Jul 2011 09:53:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B76721C17E for ; Wed, 27 Jul 2011 09:53:54 +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 1DA461B402F for ; Wed, 27 Jul 2011 09:53:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7F3908003D for ; Wed, 27 Jul 2011 09:53:53 +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: <9a31128ea29f2fb3f4bde03273d671a0e01332bf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9a31128ea29f2fb3f4bde03273d671a0e01332bf Date: Wed, 27 Jul 2011 09:53:53 +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: 4c686b95e36e25b8ad41ff0a3bd20f0f commit: 9a31128ea29f2fb3f4bde03273d671a0e01332bf Author: Zac Medico gentoo org> AuthorDate: Wed Jul 27 09:53:40 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jul 27 09:53:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9a31128e config: fix AttributeError: 'NoneType' errors This is a regression from commit 1fdeb78d08bac14f3f999f112499d179a87cf342 and it can only be triggered when repo-level package.use is present. --- pym/portage/package/ebuild/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 8b1a1a1..a8c6ad6 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1148,7 +1148,7 @@ class config(object): d =3D d.copy() cpdict =3D self._use_manager._repo_puse_dict.get(repo, {}).get(cp) if cpdict: - repo_puse =3D ordered_by_atom_specificity(cpdict, pkg) + repo_puse =3D ordered_by_atom_specificity(cpdict, cpv_slot) if repo_puse: for x in repo_puse: d["USE"] =3D d.get("USE", "") + " " + " ".join(x)