Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Thu, 03 May 2018 01:15:29
Message-Id: 1525309975.9ad4ed599f2e56d7a73f129ec8969d7295fd8df3.zmedico@gentoo
1 commit: 9ad4ed599f2e56d7a73f129ec8969d7295fd8df3
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 3 01:12:55 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu May 3 01:12:55 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ad4ed59
7
8 bin/ebuild: selectively handle PortageKeyerror from doebuild
9
10 In order to avoid swallowing an unexpected KeyError, selectively
11 handle PortageKeyerror from doebuild.
12
13 bin/ebuild | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/bin/ebuild b/bin/ebuild
17 index b1ef0573b..5221b21a8 100755
18 --- a/bin/ebuild
19 +++ b/bin/ebuild
20 @@ -1,5 +1,5 @@
21 #!/usr/bin/python -b
22 -# Copyright 1999-2015 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 from __future__ import print_function
27 @@ -352,7 +352,7 @@ for arg in pargs:
28 except KeyboardInterrupt:
29 print("Interrupted.")
30 a = 1
31 - except KeyError:
32 + except PortageKeyError:
33 # aux_get error
34 a = 1
35 except UnsupportedAPIException as e: