a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10722 from mscherer/fix_wrong_exception 

Do add a unused named argument using a variable that was removed
pull/4420/head
Toshio Kuratomi 2015-04-15 09:15:56 -07:00
parent 1afd24ae9f b43ede1eb4
commit 3f03f76f97
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2/ansible/playbook/role/__init__.py
View File

@ -172,13 +172,13 @@ class Role(Base, Become, Conditional, Taggable):
# vars and default vars are regular dictionaries # vars and default vars are regular dictionaries
self._role_vars = self._load_role_yaml('vars') self._role_vars = self._load_role_yaml('vars')
if not isinstance(self._role_vars, (dict, NoneType)): if not isinstance(self._role_vars, (dict, NoneType)):
raise AnsibleParserError("The vars/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name, obj=ds) raise AnsibleParserError("The vars/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name)
elif self._role_vars is None: elif self._role_vars is None:
self._role_vars = dict() self._role_vars = dict()
self._default_vars = self._load_role_yaml('defaults') self._default_vars = self._load_role_yaml('defaults')
if not isinstance(self._default_vars, (dict, NoneType)): if not isinstance(self._default_vars, (dict, NoneType)):
raise AnsibleParserError("The default/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name, obj=ds) raise AnsibleParserError("The default/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name)
elif self._default_vars is None: elif self._default_vars is None:
self._default_vars = dict() self._default_vars = dict()