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

Better handling of package groups in pacman module

Browse source
This commit is contained in:
Will Keeling 2016-02-11 20:44:30 +00:00
parent 9835b6a477
commit 282deb3291
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packaging/os/pacman.py
View file

@ -267,6 +267,25 @@ def check_packages(module, pacman_path, packages, state):
module.exit_json(changed=False, msg="package(s) already %s" % state)
def expand_package_groups(module, pacman_path, pkgs):
expanded = []
for pkg in pkgs:
cmd = "%s -Sgq %s" % (pacman_path, pkg)
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc == 0:
# A group was found matching the name, so expand it
for name in stdout.split('\n'):
name = name.strip()
if name:
expanded.append(name)
else:
expanded.append(pkg)
return expanded
def main():
module = AnsibleModule(
argument_spec = dict(
@ -305,7 +324,7 @@ def main():
upgrade(module, pacman_path)
if p['name']:
pkgs = p['name']
pkgs = expand_package_groups(module, pacman_path, p['name'])
pkg_files = []
for i, pkg in enumerate(pkgs):