Skip to content
Snippets Groups Projects
Unverified Commit 80fcdae5 authored by Marco Sirabella's avatar Marco Sirabella
Browse files

Handle conflicting CLI and verbose=# better

parent b0cdd434
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -2257,7 +2257,7 @@ def read_config(options, args, arglist, parser):
 
 
def process_options(arglist=None, parse_argv=False, config_file=None,
parser=None, verbose=0):
parser=None, verbose=None):
"""Process options passed either via arglist or via command line args.
 
Passing in the ``config_file`` parameter allows other tools, such as flake8
Loading
Loading
@@ -2281,7 +2281,8 @@ def process_options(arglist=None, parse_argv=False, config_file=None,
(options, args) = parser.parse_args(arglist)
options.reporter = None
 
if verbose: # If specified verbose, continue on verbosity
# If explicity specified verbosity, override any `-v` CLI flag
if verbose is not None:
options.verbose = verbose
 
if options.ensure_value('testsuite', False):
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment