commit 6b20b7fe62a42a6f3bab68cba25bf923f822f8b6 Author: kudrom kudrom@riseup.net Date: Mon Aug 25 23:11:29 2014 +0200

Review of policy aware changes in the client --- Vagrantfile | 2 +- ooni/deck.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile index bd9d5db..4f9bc9b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant.configure("2") do |config|

config.vm.synced_folder ".", "/ooni" # Place the ooni-backend source code in ../ooni-backend to sync it with the vagrant instance - config.vm.synced_folder "../ooni-backend", "/oonib" + config.vm.synced_folder "../ooni-backend", "/backend"

end

diff --git a/ooni/deck.py b/ooni/deck.py index f77bfa6..6ea6740 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -184,7 +184,7 @@ class Deck(InputFile): 'test-helpers': [], 'input-hashes': [x['hash'] for x in net_test_loader.inputFiles] } - if not net_test_loader.collector: + if not net_test_loader.collector and not self.no_collector: requires_collector = True

for th in net_test_loader.requiredTestHelpers: