From: Karel Zak <kzak@redhat.com>
Date: Thu, 21 Oct 2021 16:27:46 +0000 (+0200)
Subject: build-sys: use set +e before patch --try in ./autogen.sh
X-Git-Tag: v2.38-rc1~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34389ad03b3ad362ce67ff60a3cc13b315af084c;p=thirdparty%2Futil-linux.git

build-sys: use set +e before patch --try in ./autogen.sh

Addresses: https://github.com/karelzak/util-linux/issues/1476
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/autogen.sh b/autogen.sh
index c71c0404d4..1ccfc6c85a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -134,10 +134,12 @@ if test -f tools/libtool.m4.patch; then
 		rm m4/libtool.m4
 		mv m4/libtool.m4.org m4/libtool.m4
 	fi
+	set +e
 	patch --batch --dry -p1 < tools/libtool.m4.patch > /dev/null 2>&1
 	if [ "$?" -eq 0 ]; then
 		patch -p1 --batch < tools/libtool.m4.patch
 	fi
+	set -e
 fi
 
 aclocal -I m4 $AL_OPTS