set default options value to None in homebrew module

reviewable/pr18780/r1
Renan Ivo 11 years ago
parent d038ea2956
commit 086da3dafc

@ -46,7 +46,7 @@ options:
description: description:
- options flags to install a package - options flags to install a package
required: false required: false
default: "" default: null
notes: [] notes: []
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -116,7 +116,10 @@ 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)
rc, out, err = module.run_command([brew_path, 'install', package, options]) if options:
rc, out, err = module.run_command([brew_path, 'install', package, options])
else:
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" % (package, out.strip()))
@ -129,6 +132,9 @@ def install_packages(module, brew_path, packages, options):
module.exit_json(changed=False, msg="package(s) already present") module.exit_json(changed=False, msg="package(s) already present")
def generate_options_string(install_options): def generate_options_string(install_options):
if install_options is None:
return ''
options_str = '' options_str = ''
for option in install_options: for option in install_options:
@ -143,7 +149,7 @@ def main():
name = dict(aliases=["pkg"], required=True), name = dict(aliases=["pkg"], required=True),
state = dict(default="present", choices=["present", "installed", "absent", "removed"]), state = dict(default="present", choices=["present", "installed", "absent", "removed"]),
update_homebrew = dict(default="no", aliases=["update-brew"], type='bool'), update_homebrew = dict(default="no", aliases=["update-brew"], type='bool'),
install_options = dict(default="", aliases=["options"], type='list') install_options = dict(default=None, aliases=["options"], type='list')
), ),
supports_check_mode=True supports_check_mode=True
) )

Loading…
Cancel
Save