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 7876B138334 for ; Mon, 10 Jun 2019 19:01:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C761E079E; Mon, 10 Jun 2019 19:01:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7FE83E079E for ; Mon, 10 Jun 2019 19:01:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 31A22345702 for ; Mon, 10 Jun 2019 19:01:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81A8E5C0 for ; Mon, 10 Jun 2019 19:01:04 +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: <1560192459.c8e59b89b3d8f1fea20ec787c65d83becc0070ff.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/config.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c8e59b89b3d8f1fea20ec787c65d83becc0070ff X-VCS-Branch: master Date: Mon, 10 Jun 2019 19:01:04 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c927483b-adbb-407f-9c04-66162a1c33d7 X-Archives-Hash: dfc1de44c6f66ca435dc539627015a0d commit: c8e59b89b3d8f1fea20ec787c65d83becc0070ff Author: Zac Medico gentoo org> AuthorDate: Mon Jun 10 18:28:56 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 10 18:47:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c8e59b89 config: don't swallow IOError for "packages" files (bug 687814) Fixes: 55b2e1c0a51d ("Turn a traceback into a graceful error") Bug: https://bugs.gentoo.org/687814 Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index cc2413989..780013bca 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -51,6 +51,7 @@ from portage.util import ensure_dirs, getconfig, grabdict, \ grabdict_package, grabfile, grabfile_package, LazyItemsDict, \ normalize_path, shlex_split, stack_dictlist, stack_dicts, stack_lists, \ writemsg, writemsg_level, _eapi_cache +from portage.util.install_mask import _raise_exc from portage.util.path import first_existing from portage.util._path import exists_raise_eaccess, isdir_raise_eaccess from portage.versions import catpkgsplit, catsplit, cpv_getkey, _pkg_str @@ -596,10 +597,8 @@ class config(object): verify_eapi=True, eapi=x.eapi, eapi_default=None, allow_build_id=x.allow_build_id) for x in profiles_complex] - except IOError as e: - if e.errno == IsADirectory.errno: - raise IsADirectory(os.path.join(self.profile_path, - "packages")) + except EnvironmentError as e: + _raise_exc(e) self.packages = tuple(stack_lists(packages_list, incremental=1))