Your message dated Mon, 28 Nov 2011 09:18:07 +0000
with message-id <[email protected]>
and subject line Bug#645094: fixed in python-django 1.3.1-3
has caused the Debian Bug report #645094,
regarding python-django: GeoIP database should be accessible with default
settings
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
645094: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645094
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: python-django
Version: 1.3.1-1
Severity: wishlist
GeoIP database should be accessible without further configuration after
installing package geoip-database-contrib.
A patch is attached to change the defaults.
Also python-django could have Suggests: geoip-database-contrib
>From 88c19ec756e6c82c49dfe401c0c930e18887916f Mon Sep 17 00:00:00 2001
From: Tapio Rantala <[email protected]>
Date: Wed, 12 Oct 2011 12:31:33 +0300
Subject: [PATCH] Use Debian default settings GeoIP database
---
django/contrib/gis/utils/geoip.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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.
* 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.
"""
# Checking the given cache option.
if cache in self.cache_options:
@@ -187,8 +188,7 @@ class GeoIP(object):
# Getting the GeoIP data path.
if not path:
- path = GEOIP_SETTINGS.get('GEOIP_PATH', None)
- if not path: raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
+ path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
if not isinstance(path, basestring):
raise TypeError('Invalid path type: %s' % type(path).__name__)
@@ -201,7 +201,7 @@ class GeoIP(object):
self._country = geoip_open(country_db, cache)
self._country_file = country_db
- city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
+ city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoIPCity.dat'))
if os.path.isfile(city_db):
self._city = geoip_open(city_db, cache)
self._city_file = city_db
--
1.7.2.5
--- End Message ---
--- Begin Message ---
Source: python-django
Source-Version: 1.3.1-3
We believe that the bug you reported is fixed in the latest version of
python-django, which is due to be installed in the Debian FTP archive:
python-django-doc_1.3.1-3_all.deb
to main/p/python-django/python-django-doc_1.3.1-3_all.deb
python-django_1.3.1-3.debian.tar.gz
to main/p/python-django/python-django_1.3.1-3.debian.tar.gz
python-django_1.3.1-3.dsc
to main/p/python-django/python-django_1.3.1-3.dsc
python-django_1.3.1-3_all.deb
to main/p/python-django/python-django_1.3.1-3_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Raphaël Hertzog <[email protected]> (supplier of updated python-django package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 28 Nov 2011 09:03:13 +0100
Source: python-django
Binary: python-django python-django-doc
Architecture: source all
Version: 1.3.1-3
Distribution: unstable
Urgency: low
Maintainer: Chris Lamb <[email protected]>
Changed-By: Raphaël Hertzog <[email protected]>
Description:
python-django - High-level Python web development framework
python-django-doc - High-level Python web development framework (documentation)
Closes: 645094 647134 649624
Changes:
python-django (1.3.1-3) unstable; urgency=low
.
* Add 06_use_debian_geoip_database_as_default.diff to use the default
location of the GeoIP database used by the Debian package
geoip-database-contrib. Closes: #645094
Add this package to suggests. Thanks to Tapio Rantala
<[email protected]> for the patch.
* Bump build-dep on python-sphinx to 1.0.8 to ensure we have a version
where #641710 is fixed. Closes: #647134
* Add 07_fix_for_sphinx1.1.2.diff to fix build with Sphinx 1.1.2. Thanks to
Jakub Wilk for the advance warning. Closes: #649624
Checksums-Sha1:
0f7d1a05f8d0449eb99cb89ce4c6016e62ed0df1 2227 python-django_1.3.1-3.dsc
468aa7746a763f192b34c0e7b92a0e6d8025fcee 21321
python-django_1.3.1-3.debian.tar.gz
9497714e286070625693d158e8aea6ae27083d3a 4379320 python-django_1.3.1-3_all.deb
e411ccdf6607dd271f0145dbd9828e9a374e35da 2120762
python-django-doc_1.3.1-3_all.deb
Checksums-Sha256:
6f90084f6ba6b22f64b36f7407f14434d385aaccf93fba4b0494d4949d5d6aab 2227
python-django_1.3.1-3.dsc
3c8bbae254a23369f33c263c0da91f2e91b48540ee91de51415d5f4237105316 21321
python-django_1.3.1-3.debian.tar.gz
de939ff79b287ce5c2a4890bdcead73fcca22fe8dfaf5cbf665f1f15aa7ac143 4379320
python-django_1.3.1-3_all.deb
0443510dba7bf86c79eac1fc53d1761034ebaf57239be008bb181d700af5b079 2120762
python-django-doc_1.3.1-3_all.deb
Files:
28931c5fa83defc292603c4b7be98122 2227 python optional python-django_1.3.1-3.dsc
92959f470c972ab40a45c877f9590b11 21321 python optional
python-django_1.3.1-3.debian.tar.gz
99cf9016c37223a1c47dfe1a2560199e 4379320 python optional
python-django_1.3.1-3_all.deb
f83b20650b1b1d4bfde8feb369798fc3 2120762 doc optional
python-django-doc_1.3.1-3_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Signed by Raphael Hertzog
iQIcBAEBCAAGBQJO00OqAAoJEOYZBF3yrHKaYboP/jnWcl8YxMAaK8sxK1r8H3Ek
nYxBMedWEEajaOt0Rj2HENmaUT5XonJOHVCXUkxWpUg9ra62G+DnzTJ+jlNDVVvl
qwTdKfF60jc0F92sEjUzdWyoVrD0S8RcH24m1PzU6gQ2zJoouiuNx0yGpYn1ASnz
O6lCC9Ye0GoMutEvoMKZ2hwbXXBkA1G8J83KgdNK2EoeXllaucCYUqOIBvwZ2UD7
YPoi9+v1ngUeyAgJqkxfL5mdVRcs2PfDeNhTEYDArh7X5a0YLeQC49nIZN6R79Sy
CoNH4XeS8Qu8MEOA18TFSCrNeyBxer3dlaSUJ9d1K0SQVAsEp+JsDJMqUqf7Mh21
DfywLPwP0CHJ+o2ALwt5SqSgr3f6yVf/IbcuRMGGEjbr96T/loUDCogibxCtH7yl
V3v6yrYgaPjLS5JZbNbmt+u7CwMijDBHmInP3LE90jGZYK+ZQP8Ul9jPkOytiIq/
gl+480+GEwMP3tj3Rw/X3AGN+T3VNUigiWL2LDNX60K88OjLi7UKEJUzc2MV1HrL
MZuGTs8XzhB0q+Cwz5aPXUcqrCdacZ1+LVLCLtD2ck/XqOUmQ/7xVJxUqxHQ9EdW
pfXo/iPARZ1PiFtWNWD+SKbHQl0TDWWxrH1sf7bdlhqGJ2OX/MkHRkZZwqZpuLYl
Gdj7QIVXhZcl+2ur6tjB
=/XSI
-----END PGP SIGNATURE-----
--- End Message ---
