1
0

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
This commit is contained in:
Fabian Vogt 2021-02-01 10:56:23 +00:00 committed by Git OBS Bridge
parent 29126d06c0
commit a95e1408a2
2 changed files with 9 additions and 2 deletions

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail # Not using -o pipefail, as SIGPIPE is annoying to deal with
set -eu
shopt -s nullglob shopt -s nullglob
if [ "${BUILD_DIST+x}" != "x" ]; then if [ "${BUILD_DIST+x}" != "x" ]; then
@ -36,7 +37,7 @@ fi
# Print all rpm files which contain os-release # Print all rpm files which contain os-release
find_release_rpms() { find_release_rpms() {
find ./repos -name \*-release\*.rpm | while read rpm; do 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}" echo "${rpm}"
fi fi
done done

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 1 10:29:08 UTC 2021 - Fabian Vogt <fvogt@suse.com>
- 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 <fvogt@suse.com> Wed Jan 27 11:25:26 UTC 2021 - Fabian Vogt <fvogt@suse.com>