From a95e1408a268de3b770d4603b0aa7b14091ba119bb0dbbfa1482fee490a75e99 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 1 Feb 2021 10:56:23 +0000 Subject: [PATCH] Accepting request 868339 from home:favogt:boo1180263 - Don't enable pipefail to avoid that rpm getting SIGPIPE because of grep -q leading to an error OBS-URL: https://build.opensuse.org/request/show/868339 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=19 --- kiwi_metainfo_helper | 5 +++-- obs-service-kiwi_metainfo_helper.changes | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kiwi_metainfo_helper b/kiwi_metainfo_helper index d1beb38..3242ae1 100644 --- a/kiwi_metainfo_helper +++ b/kiwi_metainfo_helper @@ -1,5 +1,6 @@ #!/bin/bash -set -euo pipefail +# Not using -o pipefail, as SIGPIPE is annoying to deal with +set -eu shopt -s nullglob if [ "${BUILD_DIST+x}" != "x" ]; then @@ -36,7 +37,7 @@ fi # Print all rpm files which contain os-release find_release_rpms() { find ./repos -name \*-release\*.rpm | while read rpm; do - if rpm -qlp "${rpm}" | grep -qE "^(/etc/os-release|/usr/lib/os-release)$"; then + if rpm -qlp "${rpm}" | grep -qE '^(/etc/os-release|/usr/lib/os-release)$'; then echo "${rpm}" fi done diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index 54d21a3..f523577 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 1 10:29:08 UTC 2021 - Fabian Vogt + +- Don't enable pipefail to avoid that rpm getting SIGPIPE because of + grep -q leading to an error + ------------------------------------------------------------------- Wed Jan 27 11:25:26 UTC 2021 - Fabian Vogt