diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-22 17:36:03 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-22 17:36:03 -0400 |
commit | 5934316cf47c75b758c930607c4aa19615a96812 (patch) | |
tree | 401fc2e2b31989e65718caef71fe5dd00d6264c8 /coverage/cmdline.py | |
parent | 1dd1bb962342f4ccc7d1be302b3c838a6f62902a (diff) | |
download | python-coveragepy-5934316cf47c75b758c930607c4aa19615a96812.tar.gz |
The conflict between append and parallel should take the config file into account.
Diffstat (limited to 'coverage/cmdline.py')
-rw-r--r-- | coverage/cmdline.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 413fbba..9f64f01 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -548,15 +548,15 @@ class CoverageScript(object): self.help_fn("Nothing to do.") return False - if options.append and options.parallel_mode: - self.help_fn("Can't append to data files in parallel mode.") - return False - return True def do_run(self, options, args): """Implementation of 'coverage run'.""" + if options.append and self.coverage.get_option("run:parallel"): + self.help_fn("Can't append to data files in parallel mode.") + return ERR + if not self.coverage.get_option("run:parallel"): if not options.append: self.coverage.erase() |