[tor-commits] [ooni-probe/master] Fix typo in README for installation of scapy

[art at torproject.org]

commit df94c8bbbcdd7ec46976d54c00dd312154a910c4
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Nov 11 18:58:11 2012 +0100

    Fix typo in README for installation of scapy
    * Make import of pygeoip soft
---
 README.md             |    3 +--
 ooni/utils/geodata.py |    6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c3ef8a6..9d41eea 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,7 @@ This can be done like so:
 
     wget http://www.secdev.org/projects/scapy/files/scapy-latest.tar.gz
     tar xzf scapy-latest.tar.gz
-    cd scapy-latest.tar.gz
-    cd scapy-latest
+    cd scapy-*
     python setup.py install
 
 If you are not inside of a virtual env the last command will have to be:
diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py
index 5c3c481..447d2eb 100644
--- a/ooni/utils/geodata.py
+++ b/ooni/utils/geodata.py
@@ -10,7 +10,6 @@
 
 import re
 import os
-import pygeoip
 
 from twisted.web.client import Agent
 from twisted.internet import reactor, defer, protocol
@@ -18,6 +17,11 @@ from twisted.internet import reactor, defer, protocol
 from ooni.utils import log, net
 from ooni import config
 
+try:
+    import pygeoip
+except ImportError:
+    log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements")
+
 @defer.inlineCallbacks
 def myIP():
     target_site = 'https://check.torproject.org/'