From de3d666908b77a84a136c2cfc905eece64ae9091 Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Tue, 5 Nov 2019 19:49:51 +0100
Subject: MSYS2: avoid pip upgrade failing if dependencies can't be updated

---
 buildtools/msys2installdeps.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh
index 2b5006095..4e06fa7a6 100644
--- a/buildtools/msys2installdeps.sh
+++ b/buildtools/msys2installdeps.sh
@@ -87,13 +87,17 @@ $ARCH-python3-numpy \
 $ARCH-python3-pillow \
 $ARCH-python3-six \
 $ARCH-python3-gobject
+
+PACKAGES="coverage pyserial scour"
 for arch in $(eval echo $ARCH); do
   case ${arch} in
     mingw-w64-i686)
-      /mingw32/bin/pip3 install --upgrade --upgrade-strategy eager coverage pyserial scour
+      /mingw32/bin/pip3 install --upgrade --upgrade-strategy eager ${PACKAGES} || \
+      /mingw32/bin/pip3 install --upgrade ${PACKAGES}
       ;;
     mingw-w64-x86_64)
-      /mingw64/bin/pip3 install --upgrade --upgrade-strategy eager coverage pyserial scour
+      /mingw64/bin/pip3 install --upgrade --upgrade-strategy eager ${PACKAGES} || \
+      /mingw64/bin/pip3 install --upgrade ${PACKAGES}
       ;;
   esac
 done
-- 
cgit v1.2.3