starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 19:52:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Printing pip output to terminal when -v is used

Browse Source 
Signed-off-by: Amjad Mashaal <me@amjad.io>
This commit is contained in:
Amjad Mashaal
2016-06-25 12:37:42 +02:00
parent 61b77766c2
commit 797d0a0660
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-auto-source/letsencrypt-auto.template
+9 -3
View File
@@ -247,13 +247,19 @@ UNLIKELY_EOF
# Set PATH so pipstrap upgrades the right (v)env: # Set PATH so pipstrap upgrades the right (v)env:
PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py" PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py"
set +e set +e
PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` if [ "$VERBOSE" = 1 ]; then
"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1
else
PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1`
fi
PIP_STATUS=$? PIP_STATUS=$?
set -e set -e
if [ "$PIP_STATUS" != 0 ]; then if [ "$PIP_STATUS" != 0 ]; then
# Report error. (Otherwise, be quiet.) # Report error. (Otherwise, be quiet.)
echo "Had a problem while installing Python packages:" echo "Had a problem while installing Python packages."
echo "$PIP_OUT" if [ "$VERBOSE" != 1 ]; then
echo "$PIP_OUT"
fi
rm -rf "$VENV_PATH" rm -rf "$VENV_PATH"
exit 1 exit 1
fi fi
letsencrypt-auto-source/tests/auto_test.py
+1 -1
View File
@@ -201,7 +201,7 @@ iQIDAQAB
**kwargs) **kwargs)
env.update(d) env.update(d)
return out_and_err( return out_and_err(
join(venv_dir, 'letsencrypt-auto') + ' --version', join(venv_dir, 'letsencrypt-auto') + ' --verbose --version',
shell=True, shell=True,
env=env) env=env)