summaryrefslogtreecommitdiff
path: root/coverage/cmdline.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-07-28 05:23:24 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-07-28 05:23:24 -0400
commitef8c162b454a0f294e348b27bd52475f0e512e59 (patch)
tree4a8c16027922004495059e8514334cfa8f8b9223 /coverage/cmdline.py
parentbe4cea389de959e48b9b4ace7de03a9e8e544048 (diff)
downloadpython-coveragepy-ef8c162b454a0f294e348b27bd52475f0e512e59.tar.gz
Fix brokenness in combining with an rcfile. #385
Diffstat (limited to 'coverage/cmdline.py')
-rw-r--r--coverage/cmdline.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index b4deb58..669c569 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -436,7 +436,7 @@ class CoverageScript(object):
self.do_run(options, args)
if options.action == "combine":
- data_dirs = argv if argv else None
+ data_dirs = args or None
self.coverage.combine(data_dirs)
self.coverage.save()