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