[Pkg-privacy-commits] [onioncircuits] 01/01: handle dependency on tor-geoipdb

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository onioncircuits.

commit 9f43fe2065d33f336b0d436258829d057708a4a1
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Mar 8 07:23:45 2016 +0000

    handle dependency on tor-geoipdb
---
 debian/changelog                                  |  8 ++++++++
 debian/control                                    |  1 +
 debian/patches/allow-failing-country-lookup.patch | 21 +++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b0ad94..7e07e67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+onioncircuits (0.3-2) UNRELEASED; urgency=medium
+
+  * Patch onioncircuits to be more robust if tor-geoipdb is missing
+    Closes: #817086
+  * Suggest tor-geoipdb.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Tue, 08 Mar 2016 06:47:31 +0000
+
 onioncircuits (0.3-1) unstable; urgency=low
 
   * Initial release (Closes: #796265)
diff --git a/debian/control b/debian/control
index dc16580..abb7fd4 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Depends: ${python3:Depends},
          python3-pycountry,
          gir1.2-gtk-3.0,
          gir1.2-glib-2.0
+Suggests: tor-geoipdb
 Description: GTK+ application to display Tor circuits and streams
  Onion Circuits is a GTK+ application to display Tor circuits and streams. It
  allows the user to inspect the circuits the locally running Tor daemon has
diff --git a/debian/patches/allow-failing-country-lookup.patch b/debian/patches/allow-failing-country-lookup.patch
new file mode 100644
index 0000000..a14e2f4
--- /dev/null
+++ b/debian/patches/allow-failing-country-lookup.patch
@@ -0,0 +1,21 @@
+Description: make onioncircuits more robust wrt missing geoipdb
+ This patch makes sure that onioncircuits can still display useful
+ results without tor-geoipdb installed.
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Forwarded: via email
+Last-Update: 2016-03-08 
+--- a/onioncircuits
++++ b/onioncircuits
+@@ -541,7 +541,11 @@
+         :var stem.descriptor.router_status_entry.RouterStatusEntryMicroV3
+         status_entry: the status entry for the node
+         """
+-        country = self.controller.get_info("ip-to-country/%s" % status_entry.address)
++        try:
++            country = self.controller.get_info("ip-to-country/%s" % status_entry.address)
++        except stem.ProtocolError:
++            country = "?"
++
+         if pycountry:
+             try:
+                 country = pycountry.countries.get(alpha2=country.upper()).name
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4486b6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+allow-failing-country-lookup.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncircuits.git