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

check if permissive is in global properties before allow permissive for an option

Browse Source
This commit is contained in:
Emmanuel Garette
2013-12-09 15:29:37 +01:00
parent 20bef5ff04
commit 0f966f6d26
4 changed files with 131 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tiramisu/setting.py
View File

@ -406,10 +406,11 @@ class Settings(object):
"""
# opt properties
properties = copy(self._getproperties(opt_or_descr, path))
# remove opt permissive
properties -= self._p_.getpermissive(path)
# remove global permissive if need
self_properties = copy(self._getproperties())
# remove opt permissive
if force_permissive is True or 'permissive' in self_properties:
properties -= self._p_.getpermissive(path)
# remove global permissive if need
if force_permissive is True or 'permissive' in self_properties:
properties -= self._p_.getpermissive()
if force_permissives is not None: