commit 65e2bbf115c2588c23743d88cdbb139e9e5fbb94 Author: Arturo Filastò art@fuffa.org Date: Thu Nov 13 13:21:10 2014 +0100

Initialise ooni_home before running deckgen and resources --- ooni/deckgen/cli.py | 1 + ooni/resources/cli.py | 3 +++ 2 files changed, 4 insertions(+)

diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index 77f5933..216b9a7 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -155,6 +155,7 @@ def run(): "deck-%s" % options['country-code']) options['output'] = output_dir

+ config.initialize_ooni_home() config.read_config_file()

try: diff --git a/ooni/resources/cli.py b/ooni/resources/cli.py index cab9700..b836b18 100644 --- a/ooni/resources/cli.py +++ b/ooni/resources/cli.py @@ -3,6 +3,7 @@ import sys from twisted.internet import defer from twisted.python import usage

+from ooni.settings import config from ooni.utils import log

from ooni.resources import __version__ @@ -38,6 +39,8 @@ def run(): print options sys.exit(1)

+ config.initialize_ooni_home() + config.read_config_file() if options['update-inputs']: print "Downloading inputs" try: