Merge "Don't fail on warnings in docker-cmd"

This commit is contained in:
Jenkins 2017-05-30 20:55:01 +00:00 committed by Gerrit Code Review
commit 887f06ab4c
1 changed files with 2 additions and 2 deletions

View File

@ -40,13 +40,13 @@ def main(argv=sys.argv):
if not os.path.exists(CONF_FILE):
log.warning('No config file %s' % CONF_FILE)
return 1
return 0
try:
configs = json.load(open(CONF_FILE))
except ValueError as e:
log.warning('Could not load config json: %s' % e)
return 1
return 0
cmd_config_ids = [c['id'] for c in configs
if c['group'] == 'docker-cmd']