[or-cvs] r17016: {tor} Forward port 14_fix_geoip_warning.dpatch (in tor/trunk/debian: . patches)

[weasel at seul.org]

Author: weasel
Date: 2008-09-30 09:11:36 -0400 (Tue, 30 Sep 2008)
New Revision: 17016

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/patches/14_fix_geoip_warning.dpatch
Log:
Forward port 14_fix_geoip_warning.dpatch

Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-09-30 13:11:25 UTC (rev 17015)
+++ tor/trunk/debian/changelog	2008-09-30 13:11:36 UTC (rev 17016)
@@ -1,6 +1,7 @@
 tor (0.2.1.6-alpha-1) experimental; urgency=low
 
   * New alpha release.
+  * Forward port 14_fix_geoip_warning.dpatch.
 
  -- Peter Palfrader <weasel at debian.org>  Tue, 30 Sep 2008 14:37:26 +0200
 

Modified: tor/trunk/debian/patches/14_fix_geoip_warning.dpatch
===================================================================
--- tor/trunk/debian/patches/14_fix_geoip_warning.dpatch	2008-09-30 13:11:25 UTC (rev 17015)
+++ tor/trunk/debian/patches/14_fix_geoip_warning.dpatch	2008-09-30 13:11:36 UTC (rev 17016)
@@ -26,12 +26,13 @@
 diff -urNad git-stable~/src/or/geoip.c git-stable/src/or/geoip.c
 --- git-stable~/src/or/geoip.c	2008-06-06 01:00:41.000000000 +0200
 +++ git-stable/src/or/geoip.c	2008-06-11 12:54:17.605150644 +0200
-@@ -147,7 +147,7 @@
-   int severity = should_record_bridge_info(options) ? LOG_WARN : LOG_INFO;
+@@ -182,7 +182,8 @@
+   int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;
    clear_geoip_db();
    if (!(f = fopen(filename, "r"))) {
--    log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.", filename);
-+    log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.  Do you have the tor-geoipdb package installed?", filename);
+-    log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.  %s",
++    log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. %s"
++           " Do you have the tor-geoipdb package installed?",
+            filename, msg);
      return -1;
    }
-   geoip_countries = smartlist_create();