[tor-commits] [ooni-probe/master] Leave GeoIP data in /usr/share/GeoIP

[art@xxxxxxxxxxxxxx]

commit 8c8a8a3c6af62ce8b2d3e6b6e5812572f742fe05
Author: aagbsn <aagbsn@xxxxxxxx>
Date:   Sun Oct 26 18:02:45 2014 +0000

    Leave GeoIP data in /usr/share/GeoIP
---
 ooni/settings.py |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/ooni/settings.py b/ooni/settings.py
index 342ec4e..92cedb9 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -94,9 +94,6 @@ class OConfig(object):
     def _create_config_file(self):
         target_config_file = self.config_file
         print "Creating it for you in '%s'." % target_config_file
-        usr_share_path = '/var/lib/ooni'
-        if hasattr(sys, 'real_prefix'):
-            usr_share_path = os.path.abspath(os.path.join(sys.prefix, 'share'))
         sample_config_file = os.path.join(self.data_directory,
                                           'ooniprobe.conf.sample')
 
@@ -105,8 +102,6 @@ class OConfig(object):
                 for line in f:
                     if line.startswith('    data_dir: '):
                         w.write('    data_dir: %s\n' % self.data_directory)
-                    elif line.startswith('    geoip_data_dir: '):
-                        w.write('    geoip_data_dir: %s\n' % os.path.join(usr_share_path, 'GeoIP'))
                     elif line.startswith('    logfile: '):
                         w.write('    logfile: %s\n' % os.path.join(self.ooni_home, 'ooniprobe.log'))
                     else:



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