Changeset 922

Timestamp:

10/15/07 03:56:36 (3 years ago)

Author:

dokai

Message:

Added support for the debian buildout.

Files:

• buildout/pcl.buildout/trunk/init_postgresql.py (modified) (4 diffs)

buildout/pcl.buildout/trunk/init_postgresql.py

@@ -28 +28 @@
         raise RuntimeError('Error running command: %s' % cmd)
 
-def initpg(port, datadir, postgresprefix, postgisprefix, worldborders):
+def initpg(port, datadir, postgresprefix, postgisprefix, worldborders, buildout):
     """Initializes a test PostgreSQL server."""
     # Shut down the server if it is running
@@ -87 +87 @@
         # test runner gets updated.
         open('pclcore-test-environment.cfg', 'w').write(test_env_tmpl % dict(port=port, dbname=PGDBNAME))
-        system('./bin/buildout')
+        system('./bin/buildout -c %s' % buildout)
 
     
@@ -104 +104 @@
                       default='parts/worldborders/world_borders.shp',
                       help='Location of the world_borders.shp file.')
+    parser.add_option('--buildout-cfg', dest='buildout',
+                      default='buildout.cfg',
+                      help="Buildout config to use. If you are using the debian package based buildout use 'buildout-deb.cfg' here.")
 
     options, args = parser.parse_args()
@@ -114 +117 @@
            postgresprefix=p(options.postgresprefix),
            postgisprefix=p(options.postgisprefix),
-           worldborders=p(options.worldborders))
+           worldborders=p(options.worldborders),
+           buildout=options.buildout)
 
     print '\n\n'