summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-01-23 21:09:43 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-01-23 21:09:43 +0100
commit35837cffbd96bb12eb7852f85e097567448637b3 (patch)
treecfb02443e97a5e187de387e7329f5d8b766939f0
parent5ddd83f7fe0c9a6d515cdc43ba247e24077dca6f (diff)
parent7ae1bb6341c99081f53e558e312d76a71cbb8abe (diff)
downloadpsutil-35837cffbd96bb12eb7852f85e097567448637b3.tar.gz
Merge branch 'master' into 941-cpu-freq
-rwxr-xr-xscripts/internal/winmake.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index e2c1f086..8ce51ed0 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -225,11 +225,12 @@ def install():
@cmd
def uninstall():
"""Uninstall psutil"""
- clean()
try:
import psutil
except ImportError:
+ clean()
return
+ clean()
install_pip()
sh("%s -m pip uninstall -y psutil" % PYTHON)
@@ -244,6 +245,7 @@ def uninstall():
try:
import psutil # NOQA
except ImportError:
+ clean()
return
sh("%s -m pip uninstall -y psutil" % PYTHON)
finally: