From 7e7344281d289f84fe8b275b1e95cdf9d6ec2543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 16 Nov 2021 12:37:59 +0200 Subject: [PATCH] build-python: Discard local changes before checking out a new revision Even if we don't patch cpython-mingw any longer, we still run autoreconf on it (and libffi), which can cause changes to committed files. If trying to check out a different version of the source, this would fail unless the local changes have been discarded. --- build-python.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-python.sh b/build-python.sh index 68ca52b..3b082fe 100755 --- a/build-python.sh +++ b/build-python.sh @@ -64,6 +64,7 @@ fi if [ -n "$SYNC" ] || [ -n "$CHECKOUT_LIBFFI" ]; then cd libffi [ -z "$SYNC" ] || git fetch + git reset --hard git checkout $LIBFFI_VERSION autoreconf -vfi cd .. @@ -117,6 +118,7 @@ fi if [ -n "$SYNC" ] || [ -n "$CHECKOUT_PYTHON" ]; then cd cpython-mingw [ -z "$SYNC" ] || git fetch + git reset --hard git checkout $PYTHON_VERSION_MINGW autoreconf -vfi cd ..