pvl.args: parser(config=False) to disable --config, in case app defines its own --config
authorTero Marttila <tero.marttila@aalto.fi>
Mon, 28 Jul 2014 13:15:40 +0300
changeset 34 603a823bf5df
parent 33 6779237c43a4
child 35 4c7905e1cad7
pvl.args: parser(config=False) to disable --config, in case app defines its own --config
pvl/args.py
--- a/pvl/args.py	Sun Jun 22 22:07:27 2014 +0300
+++ b/pvl/args.py	Mon Jul 28 13:15:40 2014 +0300
@@ -14,7 +14,7 @@
 
 CONFDIR = '/etc/pvl'
 
-def parser (parser, setuid=None) :
+def parser (parser, setuid=None, config=True) :
     """
         Return an optparse.OptionGroup.
     """
@@ -32,12 +32,12 @@
     general.add_option('--log-file',                                                                    help="Log to file")
     general.add_option('--debug-module',    action='append', metavar='MODULE', 
             help="Enable logging for the given logger/module name")
-
-    parser.add_option('-c', '--config',    metavar='PATH',      action='append',
-            help="Read option defaults from config")
-    parser.add_option('--config-encoding',  metavar='CHARSET',  default='utf-8',
-            help="Unicode decoding for config file")
-
+    
+    if config:
+        parser.add_option('--config',           metavar='PATH',      action='append',
+                help="Read option defaults from config")
+        parser.add_option('--config-encoding',  metavar='CHARSET',  default='utf-8',
+                help="Unicode decoding for config file")
    
     if setuid :
         general.add_option('--uid',             help="Change uid")