Author: jbronn
Date: 2010-06-23 12:19:56 -0500 (Wed, 23 Jun 2010)
New Revision: 13397
Modified:
django/branches/releases/1.2.X/django/contrib/gis/gdal/libgdal.py
Log:
[1.2.X] Fixed #13779 -- Can now discover GDAL 1.7 from debian-based packages.
Thanks to Leo for bug report and patch.
Backport of r13396 from trunk.
Modified: django/branches/releases/1.2.X/django/contrib/gis/gdal/libgdal.py
===================================================================
--- django/branches/releases/1.2.X/django/contrib/gis/gdal/libgdal.py
2010-06-23 17:17:22 UTC (rev 13396)
+++ django/branches/releases/1.2.X/django/contrib/gis/gdal/libgdal.py
2010-06-23 17:19:56 UTC (rev 13397)
@@ -14,10 +14,10 @@
lib_names = None
elif os.name == 'nt':
# Windows NT shared library
- lib_names = ['gdal16', 'gdal15']
+ lib_names = ['gdal17', 'gdal16', 'gdal15']
elif os.name == 'posix':
# *NIX library names.
- lib_names = ['gdal', 'GDAL', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
+ lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0',
'gdal1.4.0']
else:
raise OGRException('Unsupported OS "%s"' % os.name)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
