Merge #31423

sagemath · Mar 10, 2021 · 1f961aa · 1f961aa
2 parents e1f9511 + efe7523
commit 1f961aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
@@ -217,7 +217,7 @@ sdh_pip_install() {
         local sudo="$SAGE_SUDO"
     fi
     $sudo sage-pip-uninstall "$@" || \
-        sdh_die "Error uninstalling a previous version of $PKG_NAME"
+        echo 2>&1 "Warning: Failure trying to uninstall a previous version of $PKG_NAME"
 
     mkdir -p dist
     rm -f dist/*.whl

diff --git a/build/bin/sage-pip-uninstall b/build/bin/sage-pip-uninstall
@@ -21,6 +21,11 @@ PYTHON=python3
 # The PIP variable is only used to determine the name of the lock file.
 PIP=pip3
 
+# For PEP 517 packages, do not try to uninstall
+if [ ! -f setup.py ]; then
+    exit 0
+fi
+
 # Find out the name of the package that we are installing
 name="$($PYTHON setup.py --name)"