This commit is contained in:
2018-09-29 21:58:41 +02:00
parent 69da6ed5e6
commit 509d902e72
7 changed files with 20 additions and 28 deletions

View File

@ -568,7 +568,7 @@ class Settings(object):
else:
if operator == 'and':
calc_properties.add(action)
continue # pragma: no cover
continue
if breaked:
break
return calc_properties
@ -666,9 +666,8 @@ class Settings(object):
opt = None
else:
opt = option_bag.option
if all_properties and option_bag: # pragma: no cover
raise ValueError(_('opt and all_properties must not be set '
'together in reset'))
assert all_properties is False or option_bag is None, _('opt and all_properties must not be'
' set together in reset')
if opt and opt.impl_is_symlinkoption():
raise TypeError(_("can't reset properties to the symlinkoption \"{}\""
"").format(opt.impl_get_display_name()))