Skip to content

Commit

Permalink
yum: support installroot in is_group_env_installed (ansible#34182)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkrizek authored Jan 2, 2018
1 parent 5496326 commit 3681d0e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/ansible/modules/packaging/os/yum.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 3681d0e

Please sign in to comment.