ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #4898 from stoned/homebrew-install_options-fix

Browse source 
Fix homebrew module's install_options handling
This commit is contained in:
jctanner 2013-11-19 12:30:32 -08:00
commit 8277bf29d2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/packaging/homebrew
View file

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