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 1ROCeV-0001Z7-LF for garchives@archives.gentoo.org; Wed, 09 Nov 2011 18:13:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C16FD21C020; Wed, 9 Nov 2011 18:13:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8A33721C020 for ; Wed, 9 Nov 2011 18:13:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1C3E1B4018 for ; Wed, 9 Nov 2011 18:13:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 56ECC80042 for ; Wed, 9 Nov 2011 18:13:26 +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: 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: f363a020a74df08d46dd4fa8b43a5fab85034951 Date: Wed, 9 Nov 2011 18:13:26 +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: f90ea17b-70e7-42e0-bcb4-54531069e8ef X-Archives-Hash: 169a32b960938946609e1a6cd867a804 commit: f363a020a74df08d46dd4fa8b43a5fab85034951 Author: Zac Medico gentoo org> AuthorDate: Wed Nov 9 18:13:17 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 9 18:13:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df363a020 Use get(REQUIRED_USE) for emphasis. None of these cases should raise KeyError, but use get(REQUIRED_USE) anyway to emphasize that care must be taken. --- pym/_emerge/depgraph.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2296aa0..fda335f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1089,7 +1089,7 @@ class depgraph(object): # package selection, since we want to prompt the user # for USE adjustment rather than have REQUIRED_USE # affect package selection and || dep choices. - if not pkg.built and pkg.metadata["REQUIRED_USE"] and \ + if not pkg.built and pkg.metadata.get("REQUIRED_USE") and \ eapi_has_required_use(pkg.metadata["EAPI"]): required_use_is_sat =3D check_required_use( pkg.metadata["REQUIRED_USE"], @@ -3011,7 +3011,7 @@ class depgraph(object): raise if not mreasons and \ not pkg.built and \ - pkg.metadata["REQUIRED_USE"] and \ + pkg.metadata.get("REQUIRED_USE") and \ eapi_has_required_use(pkg.metadata["EAPI"]): if not check_required_use( pkg.metadata["REQUIRED_USE"], @@ -3692,7 +3692,7 @@ class depgraph(object): =20 if new_changes !=3D old_changes: #Don't do the change if it violates REQUIRED_USE. - required_use =3D pkg.metadata["REQUIRED_USE"] + required_use =3D pkg.metadata.get("REQUIRED_USE") if required_use and check_required_use(required_use, old_use, pkg.ius= e.is_valid_flag) and \ not check_required_use(required_use, new_use, pkg.iuse.is_valid_flag= ): return old_use