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 871B31384B4 for ; Sun, 13 Dec 2015 16:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A7B921C068; Sun, 13 Dec 2015 16:54:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97A8121C068 for ; Sun, 13 Dec 2015 16:54:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3ABD34087F for ; Sun, 13 Dec 2015 16:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38F3DA0E for ; Sun, 13 Dec 2015 16:54:23 +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: <1450025499.6ba56ad7be84b18dcbf15e8c6b283f5a9a559123.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: 6ba56ad7be84b18dcbf15e8c6b283f5a9a559123 X-VCS-Branch: master Date: Sun, 13 Dec 2015 16:54:23 +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: 643d302b-1318-4c55-89f6-5e39313a8352 X-Archives-Hash: 3b15b30ff321dbf8ea429ac63ab3c0ea commit: 6ba56ad7be84b18dcbf15e8c6b283f5a9a559123 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 12 21:54:22 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 13 16:51:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6ba56ad7 config.environ: remove redundant check for nonexistent keys Fixes: 39d81c514c33 ("[...]config.__getitem__(): Partially drop backward compatibility for nonexistent keys.") pym/portage/package/ebuild/config.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index cc431fc..125d979 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2712,12 +2712,9 @@ class config(object): filter_calling_env = True environ_whitelist = self._environ_whitelist - for x in self: + for x, myvalue in self.iteritems(): if x in environ_filter: continue - myvalue = self.get(x) - if myvalue is None: - continue if not isinstance(myvalue, basestring): writemsg(_("!!! Non-string value in config: %s=%s\n") % \ (x, myvalue), noiselevel=-1)