On Wed, 12 Oct 2011, Tapio Rantala wrote: > GeoIP database should be accessible without further configuration after > installing package geoip-database-contrib.
This looks like a good idea. > diff --git a/django/contrib/gis/utils/geoip.py > b/django/contrib/gis/utils/geoip.py > index eedaef9..243dd29 100644 > --- a/django/contrib/gis/utils/geoip.py > +++ b/django/contrib/gis/utils/geoip.py > @@ -164,7 +164,8 @@ class GeoIP(object): > * path: Base directory to where GeoIP data is located or the full > path > to where the city or country data files (*.dat) are located. > Assumes that both the city and country data sets are located in > - this directory; overrides the GEOIP_PATH settings attribute. > + this directory. Defaults to '/usr/share/GeoIP'; overrides the > + GEOIP_PATH settings attribute. This is not the correct explanation for your change. You should put something like this: this directory; overrides the GEOIP_PATH settings attribute. + Note that if the GEOIP_PATH settings attribute is not set, the code will + fallback to using '/usr/share/GeoIP'. > * cache: The cache settings when opening up the GeoIP datasets, > and may be an integer in (0, 1, 2, 4) corresponding to > @@ -177,7 +178,7 @@ class GeoIP(object): > 'GeoIP.dat'; overrides the GEOIP_COUNTRY settings attribute. > > * city: The name of the GeoIP city data file. Defaults to > - 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute. > + 'GeoIPCity.dat'; overrides the GEOIP_CITY settings attribute. Here the upstream documentation makes the same error than you introduced. Can you clarify it here as well? - * city: The name of the GeoIP city data file. Defaults to - 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute. + * city: The name of the GeoIP city data file. If set, it + overrides the GEOIP_CITY settings attribute. If neither are + set, then the code falls back to using 'GeoIPCity.dat'. Can you also add DEP-3 headers to your patch and send me an updated version ? http://dep.debian.net/deps/dep3/ Thank you very much! -- Raphaël Hertzog ◈ Debian Developer Pre-order a copy of the Debian Administrator's Handbook and help liberate it: http://debian-handbook.info/go/ulule-rh/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
