From 81f272babefadaf234f4b98b936ea55077439af9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 12 Feb 2025 13:01:35 +0100 Subject: [PATCH] contrib/build: ignore initial failure to set $SOURCE More fallout from set -e patch, encountered during a release. Fixes: 64f8ec6099a4 ('rpm/build*.sh: trap failures') (cherry picked from commit aea231f489daf4b240387354041bf34ac4392417) --- contrib/fedora/rpm/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index f46b9ba56e..fe2fd968d1 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -127,7 +127,7 @@ if [ -n "$SOURCE" ]; then [[ "$SOURCE_FROM_GIT" == 1 ]] && die "Cannot set both \$SOURCE and \$SOURCE_FROM_GIT=1" SOURCE_FROM_GIT=0 elif [[ "$SOURCE_FROM_GIT" != "1" ]]; then - SOURCE="$(ls -1 "$GITDIR/NetworkManager-${VERSION}.tar."* 2>/dev/null | head -n1)" + SOURCE="$(ls -1 "$GITDIR/NetworkManager-${VERSION}.tar."* 2>/dev/null | head -n1 || :)" if [[ -z "$SOURCE" ]]; then [[ "$SOURCE_FROM_GIT" == "0" ]] && die "Either set \$SOURCE or set \$SOURCE_FROM_GIT=1" SOURCE_FROM_GIT=1