tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20 from mark-adams/configflag

Browse Source 
Added -C command line flag for specifying configuration file location.
This commit is contained in:
Guillaume Ayoub 2013-01-16 02:10:42 -08:00
commit 1e95713b61
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/__main__.py
View File

@ -77,8 +77,16 @@ def run():
"-D", "--debug", action="store_true", "-D", "--debug", action="store_true",
default=config.getboolean("logging", "debug"), default=config.getboolean("logging", "debug"),
help="print debug information") help="print debug information")
options = parser.parse_args()[0] parser.add_option(
"-C", "--config",default='',
help='use a specific configuration file')
options = parser.parse_args()[0]
# Read in the configuration specified by the command line (if specified)
if options.config != '':
config.read(options.config)
# Update Radicale configuration according to options # Update Radicale configuration according to options
for option in parser.option_list: for option in parser.option_list:
key = option.dest key = option.dest
@ -86,7 +94,7 @@ def run():
section = "logging" if key == "debug" else "server" section = "logging" if key == "debug" else "server"
value = getattr(options, key) value = getattr(options, key)
config.set(section, key, str(value)) config.set(section, key, str(value))
# Start logging # Start logging
log.start() log.start()