From 004eb6992f0cd03a181305e01980c6807300a7a6 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Mon, 22 Jun 2020 10:07:47 +0430 Subject: [PATCH] Change default={'no','yes'} to default={False,True} in packaging/os modules (#554) --- plugins/modules/packaging/os/apk.py | 6 +++--- plugins/modules/packaging/os/pkgin.py | 10 +++++----- plugins/modules/packaging/os/portinstall.py | 2 +- plugins/modules/packaging/os/zypper.py | 12 ++++++------ plugins/modules/packaging/os/zypper_repository.py | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/modules/packaging/os/apk.py b/plugins/modules/packaging/os/apk.py index db91550b28..b82bf6f343 100644 --- a/plugins/modules/packaging/os/apk.py +++ b/plugins/modules/packaging/os/apk.py @@ -294,9 +294,9 @@ def main(): state=dict(default='present', choices=['present', 'installed', 'absent', 'removed', 'latest']), name=dict(type='list', elements='str'), repository=dict(type='list'), - update_cache=dict(default='no', type='bool'), - upgrade=dict(default='no', type='bool'), - available=dict(default='no', type='bool'), + update_cache=dict(default=False, type='bool'), + upgrade=dict(default=False, type='bool'), + available=dict(default=False, type='bool'), ), required_one_of=[['name', 'update_cache', 'upgrade']], mutually_exclusive=[['name', 'upgrade']], diff --git a/plugins/modules/packaging/os/pkgin.py b/plugins/modules/packaging/os/pkgin.py index 1ac107253c..5f5424106c 100644 --- a/plugins/modules/packaging/os/pkgin.py +++ b/plugins/modules/packaging/os/pkgin.py @@ -322,11 +322,11 @@ def main(): argument_spec=dict( state=dict(default="present", choices=["present", "absent"]), name=dict(aliases=["pkg"], type='list'), - update_cache=dict(default='no', type='bool'), - upgrade=dict(default='no', type='bool'), - full_upgrade=dict(default='no', type='bool'), - clean=dict(default='no', type='bool'), - force=dict(default='no', type='bool')), + update_cache=dict(default=False, type='bool'), + upgrade=dict(default=False, type='bool'), + full_upgrade=dict(default=False, type='bool'), + clean=dict(default=False, type='bool'), + force=dict(default=False, type='bool')), required_one_of=[['name', 'update_cache', 'upgrade', 'full_upgrade', 'clean']], supports_check_mode=True) diff --git a/plugins/modules/packaging/os/portinstall.py b/plugins/modules/packaging/os/portinstall.py index f3675dba6c..fa19bbca51 100644 --- a/plugins/modules/packaging/os/portinstall.py +++ b/plugins/modules/packaging/os/portinstall.py @@ -190,7 +190,7 @@ def main(): argument_spec=dict( state=dict(default="present", choices=["present", "absent"]), name=dict(aliases=["pkg"], required=True), - use_packages=dict(type='bool', default='yes'))) + use_packages=dict(type='bool', default=True))) p = module.params diff --git a/plugins/modules/packaging/os/zypper.py b/plugins/modules/packaging/os/zypper.py index aff47090f1..3c81033b8d 100644 --- a/plugins/modules/packaging/os/zypper.py +++ b/plugins/modules/packaging/os/zypper.py @@ -496,12 +496,12 @@ def main(): state=dict(required=False, default='present', choices=['absent', 'installed', 'latest', 'present', 'removed', 'dist-upgrade']), type=dict(required=False, default='package', choices=['package', 'patch', 'pattern', 'product', 'srcpackage', 'application']), extra_args_precommand=dict(required=False, default=None), - disable_gpg_check=dict(required=False, default='no', type='bool'), - disable_recommends=dict(required=False, default='yes', type='bool'), - force=dict(required=False, default='no', type='bool'), - force_resolution=dict(required=False, default='no', type='bool'), - update_cache=dict(required=False, aliases=['refresh'], default='no', type='bool'), - oldpackage=dict(required=False, default='no', type='bool'), + disable_gpg_check=dict(required=False, default=False, type='bool'), + disable_recommends=dict(required=False, default=True, type='bool'), + force=dict(required=False, default=False, type='bool'), + force_resolution=dict(required=False, default=False, type='bool'), + update_cache=dict(required=False, aliases=['refresh'], default=False, type='bool'), + oldpackage=dict(required=False, default=False, type='bool'), extra_args=dict(required=False, default=None), allow_vendor_change=dict(required=False, default=False, type='bool'), replacefiles=dict(required=False, default=False, type='bool') diff --git a/plugins/modules/packaging/os/zypper_repository.py b/plugins/modules/packaging/os/zypper_repository.py index df74bad0a9..da065b0c91 100644 --- a/plugins/modules/packaging/os/zypper_repository.py +++ b/plugins/modules/packaging/os/zypper_repository.py @@ -290,7 +290,7 @@ def main(): name=dict(required=False), repo=dict(required=False), state=dict(choices=['present', 'absent'], default='present'), - runrefresh=dict(required=False, default='no', type='bool'), + runrefresh=dict(required=False, default=False, type='bool'), description=dict(required=False), disable_gpg_check=dict(required=False, default=False, type='bool'), autorefresh=dict(required=False, default=True, type='bool', aliases=['refresh']),