diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-10-04 11:08:36 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-10-04 11:08:36 -0400 |
| commit | 76aec1b04f44713ce43f3e84113d55ef58a54d21 (patch) | |
| tree | cb38aacfcde8d2794462178b45edb623bf6fb1ac /coverage/cmdline.py | |
| parent | 448eb3521b366a487b88252f8f6027ef48ef5773 (diff) | |
| download | python-coveragepy-76aec1b04f44713ce43f3e84113d55ef58a54d21.tar.gz | |
Combining now issues warnings on unreadable files, unconditionally
Diffstat (limited to 'coverage/cmdline.py')
| -rw-r--r-- | coverage/cmdline.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 6f5719f..46a87ca 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -58,10 +58,6 @@ class Opts(object): '-i', '--ignore-errors', action='store_true', help="Ignore errors while reading source files.", ) - ignore_combine_errors = optparse.make_option( - '-i', '--ignore-errors', action='store_true', - help="Ignore errors while reading data files.", - ) include = optparse.make_option( '', '--include', action='store', metavar="PAT1,PAT2,...", @@ -270,9 +266,7 @@ CMDS = { 'combine': CmdOptionParser( "combine", - [ - Opts.ignore_combine_errors, - ] + GLOBAL_ARGS, + GLOBAL_ARGS, usage="<path1> <path2> ... <pathN>", description=( "Combine data from multiple coverage files collected " @@ -471,7 +465,7 @@ class CoverageScript(object): elif options.action == "combine": self.coverage.load() data_dirs = args or None - self.coverage.combine(data_dirs, ignore_errors=options.ignore_errors) + self.coverage.combine(data_dirs) self.coverage.save() return OK |