starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-29 17:37:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Actually all of this logic was fine, and we do need to bring in the staging server value

Browse Source
This commit is contained in:
Peter Eckersley
2016-02-09 12:50:49 -08:00
parent 04926a4662
commit ed348f5528
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+7 -8
View File
@@ -1194,14 +1194,13 @@ class HelpfulArgumentParser(object):
if domain not in parsed_args.domains:
parsed_args.domains.append(domain)
if not self.detect_defaults:
if parsed_args.staging or parsed_args.dry_run:
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):
conflicts = ["--staging"] if parsed_args.staging else []
conflicts += ["--dry-run"] if parsed_args.dry_run else []
if not self.detect_defaults:
raise errors.Error("--server value conflicts with {0}".format(
" and ".join(conflicts)))
if parsed_args.staging or parsed_args.dry_run:
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):
conflicts = ["--staging"] if parsed_args.staging else []
conflicts += ["--dry-run"] if parsed_args.dry_run else []
if not self.detect_defaults:
raise errors.Error("--server value conflicts with {0}".format(
" and ".join(conflicts)))
parsed_args.server = constants.STAGING_URI