merge from val_prop_plugin branch

This commit is contained in:
Emmanuel Garette 2013-08-20 16:45:54 +02:00
parent 82b0e26568
commit 2e8c75a602
1 changed files with 1 additions and 1 deletions

View File

@ -286,7 +286,7 @@ class Settings(object):
properties -= self._p_.getpermissive(self._getkey(opt_or_descr))
#remove global permissive if need
self_properties = copy(self._getproperties())
if force_permissive is True or 'permissive' in self_properties:
if force_permissive is True or 'permissive' in self_properties:
properties -= self._p_.getpermissive()
# global properties