diff options
author | Michael DeHaan <michael@ansible.com> | 2014-08-21 16:56:58 -0400 |
---|---|---|
committer | Michael DeHaan <michael@ansible.com> | 2014-08-21 17:15:23 -0400 |
commit | e7c0b95074f5248dd7f0d7f8f6e8df649945766e (patch) | |
tree | 01403dd167545c7745a1961ca55c0a9909c8e6f9 /bin/ansible-galaxy | |
parent | 12ad110205365af431a1699dc6bab90f57736604 (diff) | |
download | ansible-e7c0b95074f5248dd7f0d7f8f6e8df649945766e.tar.gz |
Work in progress on bin/ansible-galaxy changes testing.
Diffstat (limited to 'bin/ansible-galaxy')
-rwxr-xr-x | bin/ansible-galaxy | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/ansible-galaxy b/bin/ansible-galaxy index 74fb82fbb0..3d1e53e730 100755 --- a/bin/ansible-galaxy +++ b/bin/ansible-galaxy @@ -41,6 +41,7 @@ from optparse import OptionParser import ansible.constants as C import ansible.utils +from ansible.errors import AnsibleError default_meta_template = """--- galaxy_info: @@ -342,7 +343,10 @@ def scm_archive_role(scm, role_url, role_version, role_name): tempdir = tempfile.mkdtemp() clone_cmd = [scm, 'clone', role_url, role_name] with open('/dev/null', 'w') as devnull: - popen = subprocess.Popen(clone_cmd, cwd=tempdir, stdout=devnull, stderr=devnull) + try: + popen = subprocess.Popen(clone_cmd, cwd=tempdir, stdout=devnull, stderr=devnull) + except: + raise AnsibleError("error executing: %s" % " ".join(clone_cmd)) rc = popen.wait() if rc != 0: print "Command %s failed" % ' '.join(clone_cmd) @@ -490,6 +494,9 @@ def fetch_role(role_name, target, role_data, options): def install_role(role_name, role_version, role_filename, options): # the file is a tar, so open it that way and extract it # to the specified (or default) roles directory + + print "DEBUG: FN=%s" % role_filename + if not tarfile.is_tarfile(role_filename): print "Error: the file downloaded was not a tar.gz" return False |