Update of /cvsroot/monetdb/MonetDB4/src/mapi/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12229/MonetDB4/src/mapi/Tests
Modified Files:
manyMapiClients.MIL.py
Log Message:
another attempt to get this right,
in case MonetDB-Clients is installed in a different prefix than MonetDB
Index: manyMapiClients.MIL.py
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/mapi/Tests/manyMapiClients.MIL.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- manyMapiClients.MIL.py 14 Sep 2007 09:00:17 -0000 1.4
+++ manyMapiClients.MIL.py 15 Sep 2007 10:12:46 -0000 1.5
@@ -1,10 +1,18 @@
import sys
import os
-# assume MonetDB-Clients destination PYTHON_LIBDIR
-# is in Python's default search path,
-# or `monetdb-clients-config --pythonlibdir` is in PYTHONPATH
-from MonetDB.Mapi import server
+try:
+ # assume MonetDB & MonetDB-Clients share the same prefix,
+ # and their hence shared destination PYTHON_LIBDIR
+ # is in Python's default search path,
+ # or `monetdb-config --pythonlibdir` is in PYTHONPATH
+ from MonetDB.Mapi import server
+except ImportError:
+ # assume MonetDB-Clients uses a different prefix than MonetDB,
+ # and MonetDB-Clients' destination PYTHON_LIBDIR/MonetDB
+ # is in Python's default search path,
+ # or `monetdb-clients-config --pythonlibdir`/MonetDB is in PYTHONPATH
+ from Mapi import server
def main(argv) :
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
