diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-01-18 11:23:04 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-01-18 15:13:36 -0700 |
| commit | 46df46ab6034b7efdb94492584308e7cd42b6077 (patch) | |
| tree | 33201780cd82169a48224b9dc639becb1d79b0aa | |
| parent | 0356c46e537fd01794bf2880a06b1d38a0bee3f9 (diff) | |
| download | podman-46df46ab6034b7efdb94492584308e7cd42b6077.tar.gz podman-46df46ab6034b7efdb94492584308e7cd42b6077.tar.bz2 podman-46df46ab6034b7efdb94492584308e7cd42b6077.zip | |
runner.sh : deal with bash 'set -e'
Release trigger script failed[1] because the entire script
runs under 'set -e'; so a 'grep -- -dev' that finds no
results will cause a nonzero exit status and hence the
entire script to fail. Work around that.
[1] https://cirrus-ci.com/task/4541290882793472
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rwxr-xr-x | contrib/cirrus/runner.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index b0060163e..572f0b44a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -210,7 +210,8 @@ function _run_release() { bin/podman info msg "Checking podman release (or potential release) criteria." - dev=$(bin/podman info |& grep -- -dev) + # We're running under 'set -eo pipefail'; make sure this statement passes + dev=$(bin/podman info |& grep -- -dev || echo -n '') if [[ -n "$dev" ]]; then die "Releases must never contain '-dev' in output of 'podman info' ($dev)" fi |