actuall use new config
authorMarko Kreen <markokr@gmail.com>
Mon, 9 Apr 2007 14:58:49 +0000 (14:58 +0000)
committerMarko Kreen <markokr@gmail.com>
Mon, 9 Apr 2007 14:58:49 +0000 (14:58 +0000)
python/skytools/sqltools.py

index b1f9b1dfc9225a82fc90863f25453a38823fca7a..f9144031d7800b535f15db86ee0656dccddfaacb 100644 (file)
@@ -367,15 +367,8 @@ class DBObject(object):
         if self.sql_file[0] == "/":
             full_fn = self.sql_file
         else:
-            dir_list = skytools.installer_config.dir_list
-            contrib_list = [
-                "/opt/pgsql/share/contrib",
-                "/usr/share/postgresql/8.0/contrib",
-                "/usr/share/postgresql/8.0/contrib",
-                "/usr/share/postgresql/8.1/contrib",
-                "/usr/share/postgresql/8.2/contrib",
-            ]
-            for dir in contrib_list:
+            dir_list = skytools.installer_config.sql_locations
+            for dir in dir_list:
                 fn = os.path.join(dir, self.sql_file)
                 if os.path.isfile(fn):
                     full_fn = fn