diff options
| -rw-r--r-- | acme/setup.py | 2 | ||||
| -rw-r--r-- | certbot/cli.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/acme/setup.py b/acme/setup.py index e0fd92f01..5cd88d17e 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -20,7 +20,7 @@ install_requires = [ # For pkg_resources. >=1.0 so pip resolves it to a version cryptography # will tolerate; see #2599: 'setuptools>=1.0', - 'six', + 'six>=1.9.0', # needed for python_2_unicode_compatible ] # env markers cause problems with older pip and setuptools diff --git a/certbot/cli.py b/certbot/cli.py index fe80a8cdf..97954004b 100644 --- a/certbot/cli.py +++ b/certbot/cli.py @@ -49,8 +49,13 @@ if "CERTBOT_AUTO" in os.environ: # user saved the script under a different name LEAUTO = os.path.basename(os.environ["CERTBOT_AUTO"]) -fragment = os.path.join(".local", "share", "letsencrypt") -cli_command = LEAUTO if fragment in sys.argv[0] else "certbot" +old_path_fragment = os.path.join(".local", "share", "letsencrypt") +new_path_prefix = os.path.abspath(os.path.join(os.sep, "opt", + "eff.org", "certbot", "venv")) +if old_path_fragment in sys.argv[0] or sys.argv[0].startswith(new_path_prefix): + cli_command = LEAUTO +else: + cli_command = "certbot" # Argparse's help formatting has a lot of unhelpful peculiarities, so we want # to replace as much of it as we can... |