Added exceptionHandled for s390x build failures

Resolves: RHEL-161232
Resolves: RHEL-161348
Resolves: RHEL-165594
This commit is contained in:
Jan Horak 2026-04-15 09:33:02 +02:00
parent 3c47bde61f
commit dc4d5ea5f6
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,29 @@
diff -up firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py.exceptionHandled-for-IO-error-processhandler firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py
--- firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py.exceptionHandled-for-IO-error-processhandler 2025-07-14 19:14:55.000000000 +0200
+++ firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py 2025-08-05 18:05:54.329479764 +0200
@@ -1098,11 +1098,22 @@ class ProcessReader:
def _read_stream(self, stream, queue, callback):
sentinel = "" if isinstance(stream, io.TextIOBase) else b""
- for line in iter(stream.readline, sentinel):
- queue.put((line, callback))
+ try:
+ for line in iter(stream.readline, sentinel):
+ queue.put((line, callback))
+ except ValueError as e:
+ if "I/O operation on closed file" in str(e):
+ # Stream was closed by the process, this is normal
+ pass
+ else:
+ raise
# Give a chance to the reading loop to exit without a timeout.
queue.put((b"", None))
- stream.close()
+ try:
+ stream.close()
+ except ValueError:
+ # Stream might already be closed
+ pass
def start(self, proc):
queue = Queue()

View File

@ -205,6 +205,8 @@ Patch19: build-min-lexical.patch
# -- Upstreamed patches --
Patch51: mozilla-bmo1170092.patch
Patch52: exceptionHandled-for-IO-error-processhandler.patch
# -- Submitted upstream, not merged --
Patch102: mozilla-bmo1670333.patch
@ -1107,6 +1109,7 @@ echo "--------------------------------------------"
# -- Upstreamed patches --
%patch -P51 -p1 -b .mozilla-bmo1170092
%patch -P52 -p1 -b .exceptionHandled-for-IO-error-processhandler
# -- Submitted upstream, not merged --
%patch -P102 -p1 -b .mozilla-bmo1670333