From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A2731382C5 for ; Thu, 3 May 2018 01:15:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87EE1E09F4; Thu, 3 May 2018 01:15:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 631E8E09F4 for ; Thu, 3 May 2018 01:15:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8076D335C5A for ; Thu, 3 May 2018 01:15:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F33A42C for ; Thu, 3 May 2018 01:15:24 +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: <1525309975.9ad4ed599f2e56d7a73f129ec8969d7295fd8df3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9ad4ed599f2e56d7a73f129ec8969d7295fd8df3 X-VCS-Branch: master Date: Thu, 3 May 2018 01:15:24 +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: 5dfafbde-6c8e-4024-96e7-78bc323ddfed X-Archives-Hash: 133d2f1ffd1f8b9ea7fc9e4238fe431d commit: 9ad4ed599f2e56d7a73f129ec8969d7295fd8df3 Author: Zac Medico gentoo org> AuthorDate: Thu May 3 01:12:55 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 3 01:12:55 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ad4ed59 bin/ebuild: selectively handle PortageKeyerror from doebuild In order to avoid swallowing an unexpected KeyError, selectively handle PortageKeyerror from doebuild. bin/ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index b1ef0573b..5221b21a8 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -1,5 +1,5 @@ #!/usr/bin/python -b -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -352,7 +352,7 @@ for arg in pargs: except KeyboardInterrupt: print("Interrupted.") a = 1 - except KeyError: + except PortageKeyError: # aux_get error a = 1 except UnsupportedAPIException as e: