don't raise if check_disabled is True

This commit is contained in:
Emmanuel Garette 2013-04-22 20:42:54 +02:00
parent ec88d817ae
commit e5de0234c2
1 changed files with 4 additions and 2 deletions

View File

@ -44,9 +44,11 @@ def carry_out_calculation(name, config, callback, callback_params):
for key, values in callback_params.items(): for key, values in callback_params.items():
for value in values: for value in values:
if type(value) == tuple: if type(value) == tuple:
if config is None:
raise ConfigError(_('no config specified but needed'))
path, check_disabled = value path, check_disabled = value
if config is None:
if check_disabled:
continue
raise ConfigError(_('no config specified but needed'))
try: try:
opt_value = config._getattr(path, force_permissive=True) opt_value = config._getattr(path, force_permissive=True)
opt = config.unwrap_from_path(path) opt = config.unwrap_from_path(path)