[tor-commits] [ooni-probe/master] Don't look for the namebench csv file since we don't ship it

[art at torproject.org]

commit da00195094cdf22678d42608cdbc3bb22b9d757e
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed Aug 10 18:11:06 2016 +0200

    Don't look for the namebench csv file since we don't ship it
    
    * Include an empty file so that older ooniprobes don't end up always updating
      the resources on every cycle.
---
 ooni/deckgen/cli.py | 4 ----
 setup.py            | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py
index a6046f3..27e465a 100644
--- a/ooni/deckgen/cli.py
+++ b/ooni/deckgen/cli.py
@@ -122,10 +122,6 @@ def resources_up_to_date():
         return False
 
     if config.get_data_file_path("resources/"
-                                 "namebench-dns-servers.csv") is None:
-        return False
-
-    if config.get_data_file_path("resources/"
                                  "citizenlab-test-lists/"
                                  "global.csv") is None:
         return False
diff --git a/setup.py b/setup.py
index ff1b6c2..b175662 100644
--- a/setup.py
+++ b/setup.py
@@ -279,6 +279,9 @@ class CreateOoniResources(Command):
                     pj(pkg_dir, "GeoIP", "GeoIPASNum.dat"))
         shutil.move(pj(tmp_dir, "test-lists-master", "lists"),
                     pj(pkg_dir, "resources", "citizenlab-test-lists"))
+        # Touch the namebench dns servers file
+        with open(pj(pkg_dir, "resources", "namebench-dns-servers.csv"), "w"):
+            pass
         # Don't include services and official lists
         shutil.rmtree(
             pj(pkg_dir,