summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jcammarata@ansibleworks.com>2013-12-20 09:26:42 -0600
committerJames Tanner <tanner.jc@gmail.com>2013-12-20 13:19:01 -0500
commit9047fc418db9b364822f94725a376d051b1cb638 (patch)
tree30340cdce493d342c65124f7b06e7f62d998a11f
parent63b31eec51d7f0ad6a89e8d9ecc7540a62925055 (diff)
downloadansible-9047fc418db9b364822f94725a376d051b1cb638.tar.gz
Don't create main.yml in files/templates directories on galaxy init
-rwxr-xr-xbin/ansible-galaxy2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ansible-galaxy b/bin/ansible-galaxy
index 8d28ffa991..e567fd0564 100755
--- a/bin/ansible-galaxy
+++ b/bin/ansible-galaxy
@@ -523,7 +523,7 @@ def execute_init(args, options):
f.write(rendered_meta)
f.close()
pass
- else:
+ elif dir not in ('files','templates'):
# just write a (mostly) empty YAML file for main.yml
f = open(main_yml_path, 'w')
f.write('---\n# %s file for %s\n' % (dir,role_name))