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

Merge pull request #2770 from letsencrypt/dedeprecate-leauto

Browse source 
Reuse venv with le-auto
This commit is contained in:
Peter Eckersley 2016-04-05 17:40:20 -07:00
commit 23167eccb0
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
letsencrypt-auto-source/letsencrypt-auto
View file

@ -445,7 +445,8 @@ if [ "$1" = "--le-auto-phase2" ]; then
shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2)
# --version output ran through grep due to python-cryptography DeprecationWarnings
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | grep ^letsencrypt | cut -d " " -f 2)
else
INSTALLED_VERSION="none"
fi
@ -700,7 +701,7 @@ except ImportError:
cmd = kwargs.get("args")
if cmd is None:
cmd = popenargs[0]
raise CalledProcessError(retcode, cmd, output=output)
raise CalledProcessError(retcode, cmd)
return output
from sys import exit, version_info
from tempfile import mkdtemp
@ -714,7 +715,7 @@ except ImportError:
from urllib.parse import urlparse # 3.4
__version__ = 1, 1, 0
__version__ = 1, 1, 1
# wheel has a conditional dependency on argparse:

3
letsencrypt-auto-source/letsencrypt-auto.template
View file

@ -176,7 +176,8 @@ if [ "$1" = "--le-auto-phase2" ]; then
shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2)
# --version output ran through grep due to python-cryptography DeprecationWarnings
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | grep ^letsencrypt | cut -d " " -f 2)
else
INSTALLED_VERSION="none"
fi