[tor-commits] [ooni-probe/master] Use settings.Config.ooni_home as the data directory (to avoid broken paths when using sudo or setting environment vars)

[art@xxxxxxxxxxxxxx]

commit edcb8379aa78d2e9fdeb039aa7e6fd82170fa2dd
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Mon Apr 18 18:46:33 2016 +0200

    Use settings.Config.ooni_home as the data directory (to avoid broken paths when using sudo or setting environment vars)
---
 ooni/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooni/settings.py b/ooni/settings.py
index 6e0f9a5..ffbf68e 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -58,7 +58,7 @@ class OConfig(object):
     @property
     def data_directory_candidates(self):
         dirs = [
-            os.path.join(expanduser('~'+self.current_user), '.ooni'),
+            self.ooni_home,
             self.var_lib_path,
             self.usr_share_path,
             os.path.join(get_ooni_root(), '..', 'data'),



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits