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

Fix homebrew module's install_options handling

Browse source 
...each given option must be a single element in the
arguments list passed as first argument to module.run_command()
This commit is contained in:
Stoned Elipot 2013-11-13 23:20:53 +01:00
parent 0f3093516d
commit 11524646b4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packaging/homebrew
View file

@ -116,13 +116,13 @@ def install_packages(module, brew_path, packages, options):
if module.check_mode:
module.exit_json(changed=True)
cmd = [brew_path, 'install', package]
if options:
rc, out, err = module.run_command([brew_path, 'install', package, options])
else:
rc, out, err = module.run_command([brew_path, 'install', package])
cmd.extend(options)
rc, out, err = module.run_command(cmd)
if not query_package(module, brew_path, package):
module.fail_json(msg="failed to install %s: %s" % (package, out.strip()))
module.fail_json(msg="failed to install %s: '%s' %s" % (package, cmd, out.strip()))
installed_count += 1
@ -133,14 +133,14 @@ def install_packages(module, brew_path, packages, options):
def generate_options_string(install_options):
if install_options is None:
return ''
return None
options_str = ''
options = []
for option in install_options:
options_str += ' --%s' % option
options.append('--%s' % option)
return options_str.strip()
return options
def main():