openstack
/
freezer
Code Issues Proposed changes

Merge "Fix KeyError if a deprecated key is given"

This commit is contained in:
Zuul 2018-07-09 13:27:02 +00:00 committed by Gerrit Code Review
parent 0490f7e1d0 c1499e54cd
commit 0636058b4f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freezer/common/config.py
View File

@ -570,6 +570,11 @@ def get_backup_args():
except NoSuchOptError:
LOG.debug('No such opt, {0}, so set it'.format(config_key))
setattr(CONF, config_key, conf.default[config_key])
except KeyError:
real_opt, real_group = CONF._find_deprecated_opts(config_key)
if '-' in real_opt:
real_opt = real_opt.replace('-', '_')
CONF.set_override(real_opt, conf.default[real_opt])
if defaults['log_file']:
CONF.set_override('log_file', defaults['log_file'])