From 0aa123995b0ad6fb97f25b5a3b181896f0f8168e Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Mon, 8 Feb 2016 23:09:47 -0500
Subject: [PATCH] cleanup cleanup
---
bin/steps/pip-install | 4 +---
bin/utils | 10 ----------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index 820bbb8f..0185f08b 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -5,12 +5,10 @@ puts-cmd "pip install -r requirements.txt"
[ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
set +e
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | log-output | cleanup | indent
+/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
PIP_STATUS="${PIPESTATUS[0]}"
set -e
-wait
-
show-warnings
if [[ ! $PIP_STATUS -eq 0 ]]; then
diff --git a/bin/utils b/bin/utils
index 569fff9a..dd15c6eb 100755
--- a/bin/utils
+++ b/bin/utils
@@ -11,16 +11,6 @@ indent() {
sed "s/^/ /"
}
-# Log output for warning detection
-log-output() (
- while read LINE;
- do
- echo "$LINE"
- echo "$LINE" >> "$WARNINGS_LOG"
- done
-
-)
-
# Clean up pip output
cleanup() {
sed -e 's/\.\.\.\+/.../g' | sed -e '/already satisfied/Id' | sed -e '/Overwriting/Id' | sed -e '/python executable/Id' | sed -e '/no previously-included files/Id'
--
GitLab