Update of /cvsroot/monetdb/MonetDB/src/common
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28353/src/common
Modified Files:
Tag: GDK-2
monet_options.py.in
Log Message:
propagated changes of Friday Aug 17 2007 - Tuesday Aug 21 2007
from the development trunk to the GDK-2 branch
Index: monet_options.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/common/monet_options.py.in,v
retrieving revision 1.31
retrieving revision 1.31.6.1
diff -u -d -r1.31 -r1.31.6.1
--- monet_options.py.in 3 Jan 2007 12:21:03 -0000 1.31
+++ monet_options.py.in 21 Aug 2007 13:25:12 -0000 1.31.6.1
@@ -179,7 +179,7 @@
val = getattr(options, name)
sys.stderr.write('%s = %s\n' % (name, val))
-def parse_options(argv, cmd_options = cmd_options, usage = usage):
+def parse_options(argv, cmd_options = cmd_options, usage = usage,
default_config = True):
'''parse_options(argv) -> options
This is the main interface to this module.
@@ -243,7 +243,7 @@
setattr(options, key, val)
elif long == 'help':
usage(cmd_options)
- if not seen_config:
+ if default_config and not seen_config:
options.config =
os.path.join(BuiltinOptions.get(BuiltinOptions(),'sysconfdir'),'MonetDB.conf')
parse_config(options.config, SystemOptions)
if debug:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
