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 binary paths for classic macos packages

Browse source
This commit is contained in:
MKLeb 2023-08-29 16:39:24 -04:00 • committed by Pedro Algarvio
parent 8c44dbcc1c
commit dcd1f80cf8
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,6 +330,24 @@ class SaltPkgInstall:
self.proc.run(
*self.binary_paths["pip"], "install", "-U", "pyopenssl"
)
if platform.is_darwin():
# `which` is not catching the right paths on downgrades, explicitly defining them here
self.binary_paths = {
"salt": [self.bin_dir / "salt"],
"api": [self.bin_dir / "salt-api"],
"call": [self.bin_dir / "salt-call"],
"cloud": [self.bin_dir / "salt-cloud"],
"cp": [self.bin_dir / "salt-cp"],
"key": [self.bin_dir / "salt-key"],
"master": [self.bin_dir / "salt-master"],
"minion": [self.bin_dir / "salt-minion"],
"proxy": [self.bin_dir / "salt-proxy"],
"run": [self.bin_dir / "salt-run"],
"ssh": [self.bin_dir / "salt-ssh"],
"syndic": [self.bin_dir / "salt-syndic"],
"spm": [self.bin_dir / "spm"],
"python": [str(pathlib.Path("/usr/bin/python3"))],
}
else:
self.binary_paths["python"] = [shutil.which("salt"), "shell"]
if platform.is_darwin():