commit: c8e59b89b3d8f1fea20ec787c65d83becc0070ff
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 18:28:56 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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))
