commit: 7adc9b05fc96382d583828f660c9c2e2c2323f22 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Mar 2 04:42:12 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Mar 2 04:43:57 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7adc9b05
_check_build_log: convert zlib EOFError to eerror message (bug 711174) Display a non-fatal eerror message when EOFError is encountered, since this need not be fatal. Bug: https://bugs.gentoo.org/711174 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/package/ebuild/doebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 71e3a74ce..384a3e632 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -1884,7 +1884,7 @@ def _check_build_log(mysettings, out=None): if make_jobserver_re.match(line) is not None: make_jobserver.append(line.rstrip("\n")) - except zlib.error as e: + except (EOFError, zlib.error) as e: _eerror(["portage encountered a zlib error: '%s'" % (e,), "while reading the log file: '%s'" % logfile]) finally:
