Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2008-11-25 22:43:31 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2008-11-25 22:43:31 +0000 |
| commit | 88346a57223d10e636c600e2b8aa8b479fd680a2 (patch) | |
| tree | bf98849a739559d14f50e6737d9fd1871be45e21 | |
| parent | 98f65f13cfd1b8429a454a76d92aa24f656670b1 (diff) | |
| download | deluge-88346a57223d10e636c600e2b8aa8b479fd680a2.tar.gz deluge-88346a57223d10e636c600e2b8aa8b479fd680a2.tar.bz2 deluge-88346a57223d10e636c600e2b8aa8b479fd680a2.zip | |
Fallback to using DNS for geoip lookups if the database file is not
available
| -rw-r--r-- | deluge/core/core.py | 7 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/deluge/core/core.py b/deluge/core/core.py index 38fd9ac75..277178466 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -211,9 +211,10 @@ class Core( self.settings = lt.session_settings() self.settings.user_agent = "Deluge %s" % deluge.common.get_version() - # Load the GeoIP DB for country look-ups - self.session.load_country_db( - pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))) + # Load the GeoIP DB for country look-ups if available + geoip_db = pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat")) + if os.path.exists(geoip_db): + self.session.load_country_db(geoip_db) # Set session settings self.settings.lazy_bitfields = 1 @@ -345,7 +345,7 @@ setup( author = "Andrew Resch, Marcos Pinto, Martijn Voncken, Sadrul Habib Chowdhury", author_email = "andrewresch@gmail.com, markybob@dipconsultants.com, \ mvoncken@gmail.com, sadrul@users.sourceforge.net", - cmdclass=cmdclass, + cmdclass = cmdclass, data_files = _data_files, description = "Bittorrent Client", entry_points = """ |