diff options
Diffstat (limited to 'certbot-auto')
-rwxr-xr-x | certbot-auto | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/certbot-auto b/certbot-auto index be2c3679b..93bb05419 100755 --- a/certbot-auto +++ b/certbot-auto @@ -31,7 +31,7 @@ if [ -z "$VENV_PATH" ]; then fi VENV_BIN="$VENV_PATH/bin" BOOTSTRAP_VERSION_PATH="$VENV_PATH/certbot-auto-bootstrap-version.txt" -LE_AUTO_VERSION="0.30.0" +LE_AUTO_VERSION="0.30.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -997,10 +997,12 @@ if [ "$1" = "--le-auto-phase2" ]; then DeterminePythonVersion rm -rf "$VENV_PATH" if [ "$PYVER" -le 27 ]; then + # Use an environment variable instead of a flag for compatibility with old versions if [ "$VERBOSE" = 1 ]; then - virtualenv --no-site-packages --python "$LE_PYTHON" "$VENV_PATH" + VIRTUALENV_NO_DOWNLOAD=1 virtualenv --no-site-packages --python "$LE_PYTHON" "$VENV_PATH" else - virtualenv --no-site-packages --python "$LE_PYTHON" "$VENV_PATH" > /dev/null + VIRTUALENV_NO_DOWNLOAD=1 virtualenv --no-site-packages --python "$LE_PYTHON" "$VENV_PATH" \ + > /dev/null fi else if [ "$VERBOSE" = 1 ]; then @@ -1230,18 +1232,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.30.0 \ - --hash=sha256:b3468e128e74d2295598f6d3fbf9d0edfb67fe5abaca3b985a9e858395bd027f \ - --hash=sha256:d631fe6c75700ce9b2fdae194ff8b53c7518545d87dd451a1704f7572dcd49e8 -acme==0.30.0 \ - --hash=sha256:eed9389f802ebf4988c9e43c28ad3d5c2734237371d78e97450a1d61189a15aa \ - --hash=sha256:984b6d00bec73dcfa616636a760e80ca14bd246fb908710a656547f542f09445 -certbot-apache==0.30.0 \ - --hash=sha256:d38c70fc6930db298ea992a3145362eebdce460d3d2651f86a8f2f43d838c6d0 \ - --hash=sha256:1d4bc207d53a3e5d37e5d9ebd05f26089aa21d1fbf384113ed9d1829b4d1e9bf -certbot-nginx==0.30.0 \ - --hash=sha256:6163c7d0080f59b4ebe510afcc6af2d2eebf15469275c3835866690db4d465d6 \ - --hash=sha256:e39a3f3d77cd4c653949cf066fb2211039fd2032665697c27b6e8501c7c2dd92 +certbot==0.30.1 \ + --hash=sha256:debdf5cfe17d55c124508a5f720e80094b82e87f167fb45cb6fda41482b6bd76 \ + --hash=sha256:39d1a58d3b59c68e57e26bcb1b73078fc227c8944388e61646dd6bbb203618e7 +acme==0.30.1 \ + --hash=sha256:b75705eba723a6082c7bc8e41853407cb1520ce64d11359ba09b269db9356aed \ + --hash=sha256:dc9b99bdbe1582993c96a8145354a61e79470be382d4d875990dd7d41727d3df +certbot-apache==0.30.1 \ + --hash=sha256:18dae95e4785e2acdbe0b8d00db9e83b890ca8145f39092911f8ea9e1b0169b3 \ + --hash=sha256:224cf83aeb85f7ca12ad08ddce020ff04576a692305f12ab1d1e7f21ee527180 +certbot-nginx==0.30.1 \ + --hash=sha256:2360e1e0e5b61c4078eced7889b90b85dc00dbc280461bf4e8fc4c3280bb3e52 \ + --hash=sha256:4e15deba3542fcf5b98d021acfdfdea2ed93db0159824271a49694cc357de7f4 UNLIKELY_EOF # ------------------------------------------------------------------------- @@ -1396,9 +1398,6 @@ def get_index_base(): def main(): pip_version = StrictVersion(check_output(['pip', '--version']) .decode('utf-8').split()[1]) - min_pip_version = StrictVersion(PIP_VERSION) - if pip_version >= min_pip_version: - return 0 has_pip_cache = pip_version >= StrictVersion('6.0') index_base = get_index_base() temp = mkdtemp(prefix='pipstrap-') |