Ticket #11677: postgis-fedora.diff

django/contrib/gis/db/backend/postgis/creation.py

@@ -190 +190 @@
             sql_path = '/usr/local/share'
 
     # The PostGIS SQL post-creation files.
-    lwpostgis_file = os.path.join(sql_path, 'lwpostgis.sql')
-    srefsys_file = os.path.join(sql_path, 'spatial_ref_sys.sql')
-    if not os.path.isfile(lwpostgis_file):
-        raise Exception('Could not find PostGIS function definitions in %s' % lwpostgis_file)
-    if not os.path.isfile(srefsys_file):
-        raise Exception('Could not find PostGIS spatial reference system definitions in %s' % srefsys_file)
+    lwpostgis_file_locations = (
+        os.path.join(sql_path, 'lwpostgis.sql'),
+        os.path.join(sql_path, 'contrib', 'lwpostgis.sql'),
+        os.path.join(sql_path, 'contrib', 'lwpostgis-64.sql'),
+    )
+    srefsys_file_locations = (
+        os.path.join(sql_path, 'spatial_ref_sys.sql'),
+        os.path.join(sql_path, 'contrib', 'spatial_ref_sys.sql'),
+    )
+    for lwpostgis_file in lwpostgis_file_locations:
+        if os.path.isfile(lwpostgis_file):
+            break
+    else:
+        raise Exception('Could not find PostGIS function definitions in any of %s' % lwpostgis_file_locations)
+    for srefsys_file in srefsys_file_locations:
+        if os.path.isfile(srefsys_file):
+            break
+    else:
+        raise Exception('Could not find PostGIS spatial reference system definitions in any of %s' % srefsys_file_locations)
 
     # Getting the psql command-line options, and command format.
     options = get_cmd_options(db_name)