diff options
author | ggardet <guillaume.gardet@opensuse.org> | 2020-10-09 13:10:09 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2020-12-10 13:28:07 +0200 |
commit | 4525ea0840d8e5c7a0c8597e09176ca5f2b0870e (patch) | |
tree | d181913479baba510069839af1c13fc19634af48 | |
parent | 3e6a832448802a2b0cd08e373ce197689d02cf60 (diff) | |
download | rpm-4525ea0840d8e5c7a0c8597e09176ca5f2b0870e.tar.gz |
Do not fail if there is no "$temp"/res.* file
find-debuginfo is multi-threaded and rpm runs
scripts usually with "-e" to abort on error.
If the debug-splitting tool fails, that job will abort.
But if you have X files that are problematic in the tree,
and you have X or less jobs, find-debuginfo will abort
as no single res.$number has been written.
But if you have more than X jobs, the build will succeed,
which makes the whole process random.
This commit remove this randomness.
(cherry picked from commit a7efb1a88e74cf074ed058ab42d3c761c093879f)
-rwxr-xr-x | scripts/find-debuginfo.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh index 081e24148..e0c36ebb6 100755 --- a/scripts/find-debuginfo.sh +++ b/scripts/find-debuginfo.sh @@ -498,6 +498,7 @@ else wait ) for f in "$temp"/res.*; do + test -f "$f" || continue res=$(< "$f") if [ "$res" != "0" ]; then exit 1 |