Merge branch 'force_permissive'

Conflicts:
	test/test_freeze.py
This commit is contained in:
2014-03-31 22:38:56 +02:00
9 changed files with 109 additions and 46 deletions

View File

@ -607,7 +607,7 @@ class Settings(object):
" '{0}' with requirement on: "
"'{1}'").format(path, reqpath))
try:
value = context._getattr(reqpath, force_permissive=True)
value = context.getattr(reqpath, force_permissive=True)
except PropertiesOptionError as err:
if not transitive:
continue