ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

PEP 8 W291 whitespace cleanup.

Browse source
This commit is contained in:
Matt Clay 2017-01-27 15:20:31 -08:00
commit d913f69ba1
166 changed files with 493 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/block.py
View file

@ -142,13 +142,13 @@ class Block(Base, Become, Conditional, Taggable):
def _load_always(self, attr, ds):
try:
return load_list_of_tasks(
ds,
ds,
play=self._play,
block=self,
role=self._role,
block=self,
role=self._role,
task_include=None,
variable_manager=self._variable_manager,
loader=self._loader,
variable_manager=self._variable_manager,
loader=self._loader,
use_handlers=self._use_handlers,
)
except AssertionError:

14
lib/ansible/playbook/role/metadata.py
View file

@ -68,20 +68,20 @@ class RoleMetadata(Base):
roles = []
if ds:
if not isinstance(ds, list):
raise AnsibleParserError("Expected role dependencies to be a list.", obj=self._ds)
raise AnsibleParserError("Expected role dependencies to be a list.", obj=self._ds)
for role_def in ds:
for role_def in ds:
if isinstance(role_def, string_types) or 'role' in role_def or 'name' in role_def:
roles.append(role_def)
roles.append(role_def)
continue
try:
try:
# role_def is new style: { src: 'galaxy.role,version,name', other_vars: "here" }
def_parsed = RoleRequirement.role_yaml_parse(role_def)
if def_parsed.get('name'):
role_def['name'] = def_parsed['name']
roles.append(role_def)
role_def['name'] = def_parsed['name']
roles.append(role_def)
except AnsibleError as exc:
raise AnsibleParserError(str(exc), obj=role_def)
raise AnsibleParserError(str(exc), obj=role_def)
current_role_path = None
if self._owner: