starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 18:56:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 3cd75603ec ee2ef9a345
commit 23167eccb0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-auto-source/letsencrypt-auto
+4 -3
View File
@@ -445,7 +445,8 @@ if [ "$1" = "--le-auto-phase2" ]; then
shift 1 # the --le-auto-phase2 arg shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then 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 else
INSTALLED_VERSION="none" INSTALLED_VERSION="none"
fi fi
@@ -700,7 +701,7 @@ except ImportError:
cmd = kwargs.get("args") cmd = kwargs.get("args")
if cmd is None: if cmd is None:
cmd = popenargs[0] cmd = popenargs[0]
raise CalledProcessError(retcode, cmd, output=output) raise CalledProcessError(retcode, cmd)
return output return output
from sys import exit, version_info from sys import exit, version_info
from tempfile import mkdtemp from tempfile import mkdtemp
@@ -714,7 +715,7 @@ except ImportError:
from urllib.parse import urlparse # 3.4 from urllib.parse import urlparse # 3.4
__version__ = 1, 1, 0 __version__ = 1, 1, 1
# wheel has a conditional dependency on argparse: # wheel has a conditional dependency on argparse:
letsencrypt-auto-source/letsencrypt-auto.template
+2 -1
View File
@@ -176,7 +176,8 @@ if [ "$1" = "--le-auto-phase2" ]; then
shift 1 # the --le-auto-phase2 arg shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then 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 else
INSTALLED_VERSION="none" INSTALLED_VERSION="none"
fi fi