summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-21 19:48:12 +0000
committerGerrit Code Review <review@openstack.org>2017-03-21 19:48:12 +0000
commit711bac3c7649fa2313e74e26e698743a631ac5ab (patch)
tree7c679b5db1bdeabaa0bb97a6a4713555fff83dd9
parentbcdaf5f7883ad76339b21b4007cfcace63384cb4 (diff)
parentf612f0e5087662feb02f763f129a5b18beeba06b (diff)
Merge "Fix ignore_path_errors call in main"
-rw-r--r--doc8/main.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc8/main.py b/doc8/main.py
index fcf7c8b..1ca2e86 100644
--- a/doc8/main.py
+++ b/doc8/main.py
@@ -346,13 +346,12 @@ def main():
346 args['ignore_path'].extend(cfg.pop('ignore_path', [])) 346 args['ignore_path'].extend(cfg.pop('ignore_path', []))
347 347
348 cfg.setdefault('ignore_path_errors', {}) 348 cfg.setdefault('ignore_path_errors', {})
349 for tmp_ignore_path_error in args.pop('ignore_path_errors', []): 349 tmp_ignores = parse_ignore_path_errors(args.pop('ignore_path_errors', []))
350 tmp_ignores = parse_ignore_path_errors(tmp_ignore_path_error) 350 for path, ignores in six.iteritems(tmp_ignores):
351 for path, ignores in six.iteritems(tmp_ignores): 351 if path in cfg['ignore_path_errors']:
352 if path in cfg['ignore_path_errors']: 352 cfg['ignore_path_errors'][path].update(ignores)
353 cfg['ignore_path_errors'][path].update(ignores) 353 else:
354 else: 354 cfg['ignore_path_errors'][path] = set(ignores)
355 cfg['ignore_path_errors'][path] = set(ignores)
356 355
357 args.update(cfg) 356 args.update(cfg)
358 setup_logging(args.get('verbose')) 357 setup_logging(args.get('verbose'))