Merge branch 'master' into pylibmc

fb189482 · Kenneth Reitz · fa8e09ae · e104d367 · fb189482
Commit fb189482 authored Aug 01, 2014 by Kenneth Reitz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

pip-uninstall bin/steps/pip-uninstall +5 -1

No files found.
--- a/bin/steps/pip-uninstall
+++ b/bin/steps/pip-uninstall
@@ -3,7 +3,11 @@ set +e
 bpwatch start pip_uninstall
 if [[ -f .heroku/python/requirements-declared.txt ]]; then

-  pip-diff --stale .heroku/python/requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+  cp .heroku/python/requirements-declared.txt requirements-declared.txt
+
+  pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+
+  rm -fr requirements-declared.txt

  if [[ -s .heroku/python/requirements-stale.txt ]]; then
    puts-step "Uninstalling stale dependencies"