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

Fix pre-commit

Browse source
This commit is contained in:
Twangboy 2023-02-09 10:19:02 -07:00 • committed by Pedro Algarvio
parent 81fd382568
commit 35428f77ad
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/tests/support/helpers.py
View file

@ -478,7 +478,18 @@ class SaltPkgInstall:
elif pkg.endswith("msi"):
# Install the package
log.debug("Installing: %s", str(pkg))
ret = self.proc.run("cmd", "/c", "msiexec.exe", "/qn", "/i", str(pkg), 'START_MINION=""', "&&", "exit", "ERRORLEVEL")
ret = self.proc.run(
"cmd",
"/c",
"msiexec.exe",
"/qn",
"/i",
str(pkg),
'START_MINION=""',
"&&",
"exit",
"ERRORLEVEL",
)
self._check_retcode(ret)
# Remove the service installed by the installer
log.debug("Removing installed salt-minion service")
@ -655,7 +666,18 @@ class SaltPkgInstall:
ret = self.proc.run(pkg_path, "/start-minion=0", "/S")
self._check_retcode(ret)
elif win_pkg.endswith("msi"):
ret = self.proc.run("cmd", "/c", "msiexec.exe", "/qn", "/i", pkg_path, 'START_MINION=""', "&&", "exit", "ERRORLEVEL")
ret = self.proc.run(
"cmd",
"/c",
"msiexec.exe",
"/qn",
"/i",
pkg_path,
'START_MINION=""',
"&&",
"exit",
"ERRORLEVEL",
)
self._check_retcode(ret)
else:
log.error("Unknown package type: %s", pkg_path)
@ -747,7 +769,9 @@ class SaltPkgInstall:
ret = self.proc.run(uninst, "/S")
self._check_retcode(ret)
elif pkg.endswith("msi"):
ret = self.proc.run("cmd", "/c", "msiexec.exe", "/qn", "/x", pkg, "&&", "exit", "0")
ret = self.proc.run(
"cmd", "/c", "msiexec.exe", "/qn", "/x", pkg, "&&", "exit", "ERRORLEVEL"
)
# self._check_retcode(ret)
if platform.is_darwin():
# From here: https://stackoverflow.com/a/46118276/4581998