diff options
| author | kali <kali@leap.se> | 2013-01-31 05:26:18 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-31 05:30:28 +0900 |
| commit | 555210630659018785fdb9d2318081a76b49fb4c (patch) | |
| tree | df7a51aaa32d9436a86881f9815d66a0f28773a5 /src/leap/util/__init__.py | |
| parent | 00276d12b44630315c19ff2cd0f906eac34d92cf (diff) | |
actually merge the release/v0.2.0 branch!
My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...
Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)
Diffstat (limited to 'src/leap/util/__init__.py')
| -rw-r--r-- | src/leap/util/__init__.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/leap/util/__init__.py b/src/leap/util/__init__.py index e69de29b..a70a9a8b 100644 --- a/src/leap/util/__init__.py +++ b/src/leap/util/__init__.py @@ -0,0 +1,9 @@ +import logging +logger = logging.getLogger(__name__) + +try: + import pygeoip + HAS_GEOIP = True +except ImportError: + logger.debug('PyGeoIP not found. Disabled Geo support.') + HAS_GEOIP = False |