cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow blank lines and comments/spaces in galaxy spec files

Browse source 
Fixes #10641 again. (Regression)
Added test to discourage future such regression.
This commit is contained in:
Will Thames 2015-11-04 15:31:11 +10:00
parent 4b75308439
commit 91b6004149
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/galaxy.py
View file

@ -328,6 +328,8 @@ class GalaxyCLI(CLI):
self.display.deprecated("going forward only the yaml format will be supported") self.display.deprecated("going forward only the yaml format will be supported")
# roles listed in a file, one per line # roles listed in a file, one per line
for rline in f.readlines(): for rline in f.readlines():
if rline.startswith("#") or rline.strip() == '':
continue
self.display.debug('found role %s in text file' % str(rline)) self.display.debug('found role %s in text file' % str(rline))
role = RoleRequirement.role_yaml_parse(rline.strip()) role = RoleRequirement.role_yaml_parse(rline.strip())
roles_left.append(GalaxyRole(self.galaxy, **role)) roles_left.append(GalaxyRole(self.galaxy, **role))

4
test/integration/galaxy_rolesfile
View file

@ -1,4 +1,8 @@
# deliberate non-empty whitespace line to follow
git+https://bitbucket.org/willthames/git-ansible-galaxy,v1.6 git+https://bitbucket.org/willthames/git-ansible-galaxy,v1.6
hg+https://bitbucket.org/willthames/hg-ansible-galaxy hg+https://bitbucket.org/willthames/hg-ansible-galaxy
https://bitbucket.org/willthames/http-ansible-galaxy/get/master.tar.gz,,http-role https://bitbucket.org/willthames/http-ansible-galaxy/get/master.tar.gz,,http-role
# comment
git+git@github.com:geerlingguy/ansible-role-php.git git+git@github.com:geerlingguy/ansible-role-php.git