upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 16:22:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix some errors.

Browse source 
Use the correct Python interpreter. Fix a syntax error. Fix a missing import.
This commit is contained in:
Erik Rose 2015-12-02 11:41:00 -05:00
parent f9d1de6179
commit 9d6cbea5ce
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
letsencrypt_auto/letsencrypt-auto.template
View file

@ -169,7 +169,6 @@ elif [ "$1" != "--_skip-to-install" ]; then
else
virtualenv --no-site-packages --python $LE_PYTHON $VENV_PATH > /dev/null
fi
NEXT: Is all this stuff in the right if branch?
# Now we drop into Python so we don't have to install even more
# dependencies (curl, etc.), for better flow control, and for the
@ -179,7 +178,7 @@ elif [ "$1" != "--_skip-to-install" ]; then
# containing a new copy of letsencrypt-auto or returns non-zero.
# There is no $ interpolation due to quotes on heredoc delimiters.
set +e
TEMP_DIR=`$PYTHON - << "UNLIKELY_EOF"
TEMP_DIR=`$LE_PYTHON - << "UNLIKELY_EOF"
{{ download_upgrade.py }}
UNLIKELY_EOF`
DOWNLOAD_STATUS=$?
@ -213,7 +212,7 @@ UNLIKELY_EOF
UNLIKELY_EOF
set +e
PEEP_OUT=`$PYTHON $TEMP_DIR/peep.py install -r $TEMP_DIR/letsencrypt-auto-requirements.txt`
PEEP_OUT=`$LE_PYTHON $TEMP_DIR/peep.py install -r $TEMP_DIR/letsencrypt-auto-requirements.txt`
PEEP_STATUS=$?
set -e
if [ "$PEEP_STATUS" = 0 ]; then

2
letsencrypt_auto/pieces/download_upgrade.py
View file

@ -1,7 +1,7 @@
from distutils.version import LooseVersion
from json import loads
from os import devnull
from os.path import join
from os.path import dirname, join
import re
from subprocess import check_call, CalledProcessError
from sys import exit