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

Fix some merge bugs

Browse Source
This commit is contained in:
Peter Eckersley
2016-01-28 17:51:42 -08:00
parent 5167f30e66
commit e056b35f28
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+2 -2
View File
@@ -1308,14 +1308,14 @@ def _process_domain(config, domain_arg, webroot_path=None):
# Each domain has a webroot_path of the most recent -w flag
# unless it was explicitly included in webroot_map
if webroot_path:
config.webroot_map.setdefault(domain, config.webroot_path[-1])
config.webroot_map.setdefault(domain, webroot_path[-1])
class WebrootMapProcessor(argparse.Action): # pylint: disable=missing-docstring
def __call__(self, parser, config, webroot_map_arg, option_string=None):
webroot_map = json.loads(webroot_map_arg)
for domains, webroot_path in webroot_map.iteritems():
_process_domain(config, domains, webroot)
_process_domain(config, domains, [webroot_path])
class DomainFlagProcessor(argparse.Action): # pylint: disable=missing-docstring