diff options
| author | Tim Graham <timograham@gmail.com> | 2017-05-08 09:42:06 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-05-08 12:26:10 -0400 |
| commit | b3e56da05061c75755475651fd57a10314e952a7 (patch) | |
| tree | f0af7be64198ee1d112c47b04adf918e92737404 | |
| parent | 7fdbd253365f934d2910de3bfd756616c306bc14 (diff) | |
[1.11.x] Fixed #28178 -- Changed contrib.gis to raise ImproperlyConfigured if gdal isn't installed.
Backport of c2975910a5bc2729c2de01eb5b84777fa59551e1 from master
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 9 | ||||
| -rw-r--r-- | docs/releases/1.11.2.txt | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 4ce0c42a06..232865f493 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -28,7 +28,7 @@ elif os.name == 'posix': # *NIX library names. lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0'] else: - raise GDALException('Unsupported OS "%s"' % os.name) + raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) # Using the ctypes `find_library` utility to find the # path to the GDAL library from the list of library names. @@ -39,9 +39,10 @@ if lib_names: break if lib_path is None: - raise GDALException( - 'Could not find the GDAL library (tried "%s"). Try setting ' - 'GDAL_LIBRARY_PATH in your settings.' % '", "'.join(lib_names) + raise ImproperlyConfigured( + 'Could not find the GDAL library (tried "%s"). Is GDAL installed? ' + 'If it is, try setting GDAL_LIBRARY_PATH in your settings.' + % '", "'.join(lib_names) ) # This loads the GDAL/OGR C library diff --git a/docs/releases/1.11.2.txt b/docs/releases/1.11.2.txt index 12c03558cc..f4d1398094 100644 --- a/docs/releases/1.11.2.txt +++ b/docs/releases/1.11.2.txt @@ -11,3 +11,7 @@ Bugfixes * Added detection for GDAL 2.1 and 2.0, and removed detection for unsupported versions 1.7 and 1.8 (:ticket:`28181`). + +* Changed ``contrib.gis`` to raise ``ImproperlyConfigured`` rather than + ``GDALException`` if ``gdal`` isn't installed, to allow third-party apps to + catch that exception (:ticket:`28178`). |