Commit 7fa2959e authored by BODERE's avatar BODERE
Browse files

Merge branch 'hotfix_6.0.17' into 'master'

Fix #84: Use of the configuration file protocol if it exists

Closes #84

See merge request downloader/downloader_daemon!49
parents 7ce7ecb0 2ead23c2
...@@ -501,6 +501,7 @@ class DCheck(object): ...@@ -501,6 +501,7 @@ class DCheck(object):
config._start_time = datetime.now() config._start_time = datetime.now()
config.test_mode = options.test_mode config.test_mode = options.test_mode
data_reader = None data_reader = None
if options.configfile is not None: if options.configfile is not None:
# check for WORKSPACE in config path # check for WORKSPACE in config path
modulepath = options.configfile modulepath = options.configfile
...@@ -527,7 +528,7 @@ class DCheck(object): ...@@ -527,7 +528,7 @@ class DCheck(object):
log.exception(e) log.exception(e)
sys.exit(1) sys.exit(1)
if len(args) > 0: elif len(args) > 0:
url = args[0] url = args[0]
setConfigFromUrl(config, url) setConfigFromUrl(config, url)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment