[tor-commits] [ooni-probe/master] Read the config file before running cli.

commit 491a78e35af0cffd799319f42ac2051b7673fd02 Author: Arturo Filastò art@fuffa.org Date: Tue Aug 12 19:08:14 2014 +0200

Read the config file before running cli. --- ooni/resources/cli.py | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/ooni/resources/cli.py b/ooni/resources/cli.py index fdcbe07..3ee7945 100644 --- a/ooni/resources/cli.py +++ b/ooni/resources/cli.py @@ -2,6 +2,8 @@ import sys

from twisted.python import usage

+from ooni.settings import config + from ooni.resources import __version__ from ooni.resources import update

@@ -21,6 +23,7 @@ class Options(usage.Options):

def run(): options = Options() + config.read_config_file() try: options.parseOptions() except usage.UsageError as error_message: