Skip to content

Better support for dnf5 in Fedora 41/42 #67975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better support for dnf5 in Fedora 41/42 #67975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/modules/yumpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2512,7 +2512,7 @@ def group_list():
}

out = __salt__["cmd.run_stdout"](
[_yum(), "grouplist", "hidden"], output_loglevel="trace", python_shell=False
[_yum(), "group", "list", "hidden"], output_loglevel="trace", python_shell=False
)
key = None
for line in salt.utils.itertools.split(out, "\n"):
Expand Down Expand Up @@ -2614,7 +2614,7 @@ def group_info(name, expand=False, ignore_groups=None, **kwargs):
}
)

cmd = [_yum(), "--quiet"] + options + ["groupinfo", name]
cmd = [_yum(), "--quiet"] + options + ["group", "info", name]
out = __salt__["cmd.run_stdout"](cmd, output_loglevel="trace", python_shell=False)

g_info = {}
Expand All @@ -2630,8 +2630,8 @@ def group_info(name, expand=False, ignore_groups=None, **kwargs):
elif "group" in g_info:
ret["type"] = "package group"

ret["group"] = g_info.get("environment group") or g_info.get("group")
ret["id"] = g_info.get("environment-id") or g_info.get("group-id")
ret["group"] = g_info.get("environment group") or g_info.get("group") or g_info.get("name")
ret["id"] = g_info.get("environment-id") or g_info.get("group-id") or g_info.get("id")
if not ret["group"] and not ret["id"]:
raise CommandExecutionError(f"Group '{name}' not found")

Expand Down