Infra
/
tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

supply make_dict with slave

This commit is contained in:
Emmanuel Garette 2018-11-17 22:37:08 +01:00
parent f86cbb1bcd
commit 17bd7c3c05
2 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tiramisu/api.py
View File

@ -1004,7 +1004,6 @@ class TiramisuContextOption(TiramisuContext):
def _filter(self, def _filter(self,
opt, opt,
subconfig): subconfig):
if self._config_bag.properties:
option_bag = OptionBag() option_bag = OptionBag()
option_bag.set_option(opt, option_bag.set_option(opt,
opt.impl_getpath(), opt.impl_getpath(),

23
tiramisu/config.py
View File

@ -331,8 +331,11 @@ class SubConfig(object):
idx, idx,
config_bag) config_bag)
soption_bag.fromconsistency = option_bag.fromconsistency.copy() soption_bag.fromconsistency = option_bag.fromconsistency.copy()
try:
value.append(self.getattr(name, value.append(self.getattr(name,
soption_bag)) soption_bag))
except PropertiesOptionError as err:
value.append(err)
else: else:
value = self.cfgimpl_get_values().get_cached_value(option_bag) value = self.cfgimpl_get_values().get_cached_value(option_bag)
self.cfgimpl_get_settings().validate_mandatory(value, self.cfgimpl_get_settings().validate_mandatory(value,
@ -574,26 +577,6 @@ class SubConfig(object):
pathsvalues) pathsvalues)
except PropertiesOptionError: except PropertiesOptionError:
pass pass
else:
if option.impl_is_master_slaves('slave'):
ret = []
try:
self.cfgimpl_get_settings().validate_properties(option_bag)
length = self.cfgimpl_get_length_slave(option_bag)
except PropertiesOptionError:
return
if length:
for idx in range(length):
soption_bag = OptionBag()
soption_bag.set_option(option,
option_bag.path,
idx,
option_bag.config_bag)
try:
ret.append(self.getattr(name,
soption_bag))
except PropertiesOptionError as err:
ret.append(err)
else: else:
try: try:
ret = self.getattr(name, ret = self.getattr(name,