Skip to content

Commit

Permalink
Merge pull request ansible#10722 from mscherer/fix_wrong_exception
Browse files Browse the repository at this point in the history
Do add a unused named argument using a variable that was removed
  • Loading branch information
abadger committed Apr 15, 2015
2 parents 1afd24a + b43ede1 commit 3f03f76
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions v2/ansible/playbook/role/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ def _load_role_data(self, role_include, parent_role=None):
# vars and default vars are regular dictionaries
self._role_vars = self._load_role_yaml('vars')
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:
self._role_vars = dict()

self._default_vars = self._load_role_yaml('defaults')
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:
self._default_vars = dict()

Expand Down

0 comments on commit 3f03f76

Please sign in to comment.