From 3681d0e3e08ebc606edba9812ee4886437c13de4 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 2 Jan 2018 12:42:53 +0100 Subject: [PATCH] yum: support installroot in is_group_env_installed (#34182) --- lib/ansible/modules/packaging/os/yum.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ansible/modules/packaging/os/yum.py b/lib/ansible/modules/packaging/os/yum.py index d4776ab2e3..f4f836b009 100644 --- a/lib/ansible/modules/packaging/os/yum.py +++ b/lib/ansible/modules/packaging/os/yum.py @@ -330,10 +330,10 @@ def po_to_envra(po): return '%s:%s-%s-%s.%s' % (po.epoch, po.name, po.version, po.release, po.arch) -def is_group_env_installed(name): +def is_group_env_installed(name, conf_file, installroot='/'): name_lower = name.lower() - my = yum_base() + my = yum_base(conf_file, installroot) if yum.__version__ >= '3.4': groups_list = my.doGroupLists(return_evgrps=True) else: @@ -793,7 +793,7 @@ def install(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos, i # groups elif spec.startswith('@'): - if is_group_env_installed(spec): + if is_group_env_installed(spec, conf_file, installroot=installroot): continue pkg = spec @@ -899,7 +899,7 @@ def remove(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos, in for pkg in items: if pkg.startswith('@'): - installed = is_group_env_installed(pkg) + installed = is_group_env_installed(pkg, conf_file, installroot=installroot) else: installed = is_installed(module, repoq, pkg, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot) @@ -932,7 +932,7 @@ def remove(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos, in # at this point we check to see if the pkg is no longer present for pkg in pkgs: if pkg.startswith('@'): - installed = is_group_env_installed(pkg) + installed = is_group_env_installed(pkg, conf_file, installroot=installroot) else: installed = is_installed(module, repoq, pkg, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot)