stove/tiramisu
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

display_name could be not unique

Browse source
This commit is contained in:
Emmanuel Garette 2016-11-21 18:49:04 +01:00
parent db517a8117
commit 05200b6d5c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tiramisu/option/baseoption.py
View file

@ -797,23 +797,25 @@ class Option(OnlyOption):
for opt_ in [opts[idx_inf], opts[idx_inf + idx_sup + 1]]: for opt_ in [opts[idx_inf], opts[idx_inf + idx_sup + 1]]:
if opt_ == current_opt: if opt_ == current_opt:
is_current = True is_current = True
equal.add('"{}"'.format(opt_.impl_get_display_name())) else:
equal.add(opt_)
if equal: if equal:
if debug: if debug:
log.debug(_('_cons_not_equal: {} are not different').format(display_list(list(equal)))) log.debug(_('_cons_not_equal: {} are not different').format(display_list(list(equal))))
if is_current: if is_current:
equal.remove('"' + current_opt.impl_get_display_name() + '"')
if warnings_only: if warnings_only:
msg = _('should be different from the value of {}') msg = _('should be different from the value of {}')
else: else:
msg = _('must be different from the value of {}') msg = _('must be different from the value of {}')
return ValueError(msg.format(display_list(list(equal))))
else: else:
if warnings_only: if warnings_only:
msg = _('value for {} should be different') msg = _('value for {} should be different')
else: else:
msg = _('value for {} must be different') msg = _('value for {} must be different')
return ValueError(msg.format(display_list(list(equal)))) equal_name = []
for opt in equal:
equal_name.append(opt.impl_get_display_name())
return ValueError(msg.format(display_list(list(equal_name))))
# serialize/unserialize # serialize/unserialize
def _impl_convert_consistencies(self, descr, load=False): def _impl_convert_consistencies(self, descr, load=False):