[tor-commits] [ooni-probe/master] Workaround crazy bugs.

[art at torproject.org]

commit eb75f19a4af364a3679ee280b0081e6cecb15bab
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Aug 15 18:22:42 2013 +0200

    Workaround crazy bugs.
---
 ooni/utils/log.py |    3 +++
 requirements.txt  |    1 -
 setup.py          |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ooni/utils/log.py b/ooni/utils/log.py
index 036a4b4..3aedc17 100644
--- a/ooni/utils/log.py
+++ b/ooni/utils/log.py
@@ -30,6 +30,9 @@ def start(logfile=None, application_name="ooniprobe"):
     if not logfile:
         logfile = config.basic.logfile
 
+    if not (os.access(logfile, os.W_OK)):
+        logfile = "ooniprobe.log"
+
     log_folder = os.path.dirname(logfile)
     log_filename = os.path.basename(logfile)
 
diff --git a/requirements.txt b/requirements.txt
index b335716..03fcdfc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 PyYAML>=3.10
 Twisted>=12.2.0
 argparse>=1.2.1
-distribute>=0.6.24
 docutils>=0.9.1
 ipaddr>=2.1.10
 pyOpenSSL>=0.13
diff --git a/setup.py b/setup.py
index 3c42218..470804c 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ setup(
     url="https://ooni.torproject.org/",
     package_dir={'ooni': 'ooni'},
     data_files=data_files,
-    packages=['ooni', 'ooni.api', 'ooni.templates', 'ooni.tests', 'ooni.utils'],
+    packages=['ooni', 'ooni.api', 'ooni.kit', 'ooni.templates', 'ooni.tests', 'ooni.utils'],
     scripts=["bin/ooniprobe"],
     dependency_links=dependency_links,
     install_requires=install_requires,