diff options
| author | Peter Eckersley <pde@users.noreply.github.com> | 2016-04-06 03:40:20 +0300 |
|---|---|---|
| committer | Peter Eckersley <pde@users.noreply.github.com> | 2016-04-06 03:40:20 +0300 |
| commit | 23167eccb0b73b0fb6b09112e5f2ad59035f0f03 (patch) | |
| tree | f8414e2f98a79251306c3dd6e0f2e6dab64eacc2 | |
| parent | 3cd75603ec2f64658a41195659b44bcb645fa01b (diff) | |
| parent | ee2ef9a345f859d3f76b54724b14fa478ddaf2ff (diff) | |
Merge pull request #2770 from letsencrypt/dedeprecate-leauto
Reuse venv with le-auto
| -rwxr-xr-x | letsencrypt-auto-source/letsencrypt-auto | 7 | ||||
| -rwxr-xr-x | letsencrypt-auto-source/letsencrypt-auto.template | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 79ce3d3cb..98e6d8e65 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -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: diff --git a/letsencrypt-auto-source/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template index 40edca7fe..526a03fae 100755 --- a/letsencrypt-auto-source/letsencrypt-auto.template +++ b/letsencrypt-auto-source/letsencrypt-auto.template @@ -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 |