Merge branch 'nspawn' of https://github.com/llua/salt into llua-nspawn

This commit is contained in:
Erik Johnson 2016-02-29 10:27:03 -06:00
commit 7243bdb134

View File

@ -1319,7 +1319,7 @@ def _pull_image(pull_type, image, name, **kwargs):
bad_kwargs = [x for x in kwargs
if not x.startswith('__')
or x not in valid_kwargs]
and x not in valid_kwargs]
if bad_kwargs:
_invalid_kwargs(*bad_kwargs, **kwargs)