From b909b0b6034897d38d9085cf35b3ec4ddf80c4ac Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 30 Jul 2012 13:41:42 -0400 Subject: [PATCH] new patch - adds a 'boolean' function to the module_common class and cleans up the apt module to use it --- apt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apt b/apt index bce0199f6e2..abc93eafbd1 100755 --- a/apt +++ b/apt @@ -130,7 +130,7 @@ def main(): if p['package'] is None and p['update_cache'] != 'yes': module.fail_json(msg='pkg=name and/or update-cache=yes is required') - install_recommends = (p['install_recommends'] == 'yes') + install_recommends = module.boolean(p['install_recommends']) cache = apt.Cache() if p['default_release']: @@ -138,16 +138,13 @@ def main(): # reopen cache w/ modified config cache.open(progress=None) - if p['update_cache'] == 'yes': + if modules.boolean(p['update_cache']) cache.update() cache.open(progress=None) if p['package'] == None: module.exit_json(changed=False) - if p['force'] == 'yes': - force_yes = True - else: - force_yes = False + force_yes = modules.boolean(p['force']) if p['package'].count('=') > 1: module.fail_json(msg='invalid package spec') @@ -164,7 +161,7 @@ def main(): install(module, p['package'], cache, default_release=p['default_release'], install_recommends=install_recommends,force=force_yes) elif p['state'] == 'removed': - remove(module, p['package'], cache, purge = p['purge']) + remove(module, p['package'], cache, purge = modules.boolean(p['purge'])) # this is magic, see lib/ansible/module_common.py #<>