diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-03-01 20:42:12 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-03-01 20:43:57 -0800 |
| commit | 7adc9b05fc96382d583828f660c9c2e2c2323f22 (patch) | |
| tree | a2984326f546da6050ee22a8923f760cc157ee2b | |
| parent | Subprocess: delay unregister in _async_wait (bug 711174) (diff) | |
| download | portage-7adc9b05.tar.gz portage-7adc9b05.tar.bz2 portage-7adc9b05.zip | |
_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@gentoo.org>
| -rw-r--r-- | lib/portage/package/ebuild/doebuild.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |