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 #2762 from letsencrypt/detect-defaults-cleanup

Browse Source 
Minor cleanup
This commit is contained in:
Peter Eckersley
2016-04-04 18:41:05 -07:00
parent c3f0025511 bb15c4696e
commit cb4fa906d8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+2 -3
View File
@@ -318,9 +318,8 @@ class HelpfulArgumentParser(object):
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI): if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):
conflicts = ["--staging"] if parsed_args.staging else [] conflicts = ["--staging"] if parsed_args.staging else []
conflicts += ["--dry-run"] if parsed_args.dry_run else [] conflicts += ["--dry-run"] if parsed_args.dry_run else []
if not self.detect_defaults: raise errors.Error("--server value conflicts with {0}".format(
raise errors.Error("--server value conflicts with {0}".format( " and ".join(conflicts)))
" and ".join(conflicts)))
parsed_args.server = constants.STAGING_URI parsed_args.server = constants.STAGING_URI