]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: use set +e before patch --try in ./autogen.sh
authorKarel Zak <kzak@redhat.com>
Thu, 21 Oct 2021 16:27:46 +0000 (18:27 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 21 Oct 2021 16:27:46 +0000 (18:27 +0200)
Addresses: https://github.com/karelzak/util-linux/issues/1476
Signed-off-by: Karel Zak <kzak@redhat.com>
autogen.sh

index c71c0404d4fad3c9f9bc9cf4456ab5aeaa972af9..1ccfc6c85ac239066b0a3cb5a8b3a412a1927708 100755 (executable)
@@ -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