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 4

Don't use dunder modules in a salt util

Browse source
This commit is contained in:
twangboy 2023-06-05 15:28:43 -06:00 • committed by Megan Wilhite
parent 6aab93fcf2
commit 998dd6aa31
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/win_pwsh.py
View file

@ -1,13 +1,8 @@
import logging
import salt.modules.cmdmod
import salt.utils.json
import salt.utils.platform
from salt.exceptions import CommandExecutionError
__salt__ = {"cmd.run_all": salt.modules.cmdmod.run_all}
log = logging.getLogger(__name__)
__virtualname__ = "win_pwsh"
@ -43,7 +38,7 @@ def run_dict(cmd, cwd=None):
cmd = f"{cmd} | ConvertTo-Json"
if "progresspreference" not in cmd.lower():
cmd = f"$ProgressPreference = 'SilentlyContinue'; {cmd}"
ret = __salt__["cmd.run_all"](cmd, shell="powershell", cwd=cwd)
ret = salt.modules.cmdmod.run_all(cmd=cmd, shell="powershell", cwd=cwd)
if "pid" in ret:
del ret["pid"]