saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't turn attr="all" into a list

Browse source 
pkg_resource.format_pkg_list expects its `attr` argument to be either a
list of attributes or the string "all" to indicate all available
attributes should be used for formatting.

Fixes: https://github.com/saltstack/salt/issues/62032
This commit is contained in:
Alexander Graul 2022-05-04 15:18:45 +02:00 • committed by Megan Wilhite
parent bb1fe9cf22
commit 84951f7cd6
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62032.fixed Normal file
View file

@ -0,0 +1 @@
Fix attr=all handling in pkg.list_pkgs() (yum/zypper).

2
salt/modules/yumpkg.py
View file

@ -735,7 +735,7 @@ def list_pkgs(versions_as_list=False, **kwargs):
return {} return {}
attr = kwargs.get("attr") attr = kwargs.get("attr")
if attr is not None: if attr is not None and attr != "all":
attr = salt.utils.args.split_input(attr) attr = salt.utils.args.split_input(attr)
contextkey = "pkg.list_pkgs" contextkey = "pkg.list_pkgs"

2
salt/modules/zypperpkg.py
View file

@ -914,7 +914,7 @@ def list_pkgs(versions_as_list=False, root=None, includes=None, **kwargs):
return {} return {}
attr = kwargs.get("attr") attr = kwargs.get("attr")
if attr is not None: if attr is not None and attr != "all":
attr = salt.utils.args.split_input(attr) attr = salt.utils.args.split_input(attr)
includes = includes if includes else [] includes = includes if includes else []