From 97658fc24b38aed0457b06033e58623c96c8bd21 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 22 Aug 2015 17:36:03 -0400 Subject: The conflict between append and parallel should take the config file into account. --- coverage/cmdline.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coverage/cmdline.py') diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 413fbba7..9f64f01e 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() -- cgit v1.2.1