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

When current_zone_only is True, ensure we append the -G options to the cmd_prefix list correctly

Browse source
This commit is contained in:
Gareth J. Greenaway 2022-07-12 11:21:39 -07:00 • committed by Megan Wilhite
parent d6740631ae
commit 4449286632
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62206.fixed Normal file
View file

@ -0,0 +1 @@
Adding -G option to pkgdd cmd_prefix list when current_zone_only is True.

2
salt/modules/solarispkg.py
View file

@ -361,7 +361,7 @@ def install(name=None, sources=None, saltenv="base", **kwargs):
# Only makes sense in a global zone but works fine in non-globals.
if kwargs.get("current_zone_only") in (True, "True"):
cmd_prefix += "-G "
cmd_prefix.append("-G ")
errors = []
for pkg in pkg_params:

8
tests/pytests/unit/modules/test_solarispkg.py
View file

@ -181,9 +181,7 @@ def test_install_single_named_package_global_zone_boolean():
"-n",
"-a",
ANY,
"-",
"G",
" ",
"-G ",
"-d",
install_target,
"all",
@ -241,9 +239,7 @@ def test_install_single_named_package_global_zone_text():
"-n",
"-a",
ANY,
"-",
"G",
" ",
"-G ",
"-d",
install_target,
"all",