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

Modify/fix handling of noreplace option issue #55365 (#55967)

Browse source 
Presently setting noreplace: no/false has no effect. Negating the default
to true from false and modifying conditionals seems to correct this.
Making it such that you can re-install and existing package. That did not
seem possible without such modifications.

Potential fix for issue #55365 pending issue reporter testing and feedback.
This commit is contained in:
William L Thomson Jr 2019-05-14 12:17:19 -04:00 committed by ansibot
parent f9b56a5b56
commit 2d4cbe0d5b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/packaging/os/portage.py
View file

@ -74,7 +74,7 @@ options:
description: description:
- Do not re-emerge installed packages (--noreplace) - Do not re-emerge installed packages (--noreplace)
type: bool type: bool
default: 'no' default: 'yes'
nodeps: nodeps:
description: description:
@ -288,9 +288,9 @@ def emerge_packages(module, packages):
"""Run emerge command against given list of atoms.""" """Run emerge command against given list of atoms."""
p = module.params p = module.params
if not (p['update'] or p['noreplace'] or p['state'] == 'latest'): if p['noreplace'] and not (p['update'] or p['state'] == 'latest'):
for package in packages: for package in packages:
if not query_package(module, package, 'emerge'): if p['noreplace'] and not query_package(module, package, 'emerge'):
break break
else: else:
module.exit_json(changed=False, msg='Packages already present.') module.exit_json(changed=False, msg='Packages already present.')
@ -472,7 +472,7 @@ def main():
newuse=dict(default=False, type='bool'), newuse=dict(default=False, type='bool'),
changed_use=dict(default=False, type='bool'), changed_use=dict(default=False, type='bool'),
oneshot=dict(default=False, type='bool'), oneshot=dict(default=False, type='bool'),
noreplace=dict(default=False, type='bool'), noreplace=dict(default=True, type='bool'),
nodeps=dict(default=False, type='bool'), nodeps=dict(default=False, type='bool'),
onlydeps=dict(default=False, type='bool'), onlydeps=dict(default=False, type='bool'),
depclean=dict(default=False, type='bool'), depclean=dict(default=False, type='bool'),