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

More fixes for upgrades of NSIS packages from relenv-based previous versions

Browse source
This commit is contained in:
MKLeb 2023-06-28 16:45:19 -04:00 • committed by Gareth J. Greenaway
parent d007ebd8d9
commit e11d6a478a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/tests/conftest.py
View file

@ -363,6 +363,8 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
master_script = True
# this check will need to be changed to install_salt.relenv
# once the package version returns 3006 and not 3005 on master
if install_salt.relenv:
master_script = True
elif not install_salt.upgrade:
master_script = True
@ -375,6 +377,8 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
python_executable = install_salt.bin_dir / "Scripts" / "python.exe"
if install_salt.classic:
python_executable = install_salt.bin_dir / "python.exe"
if install_salt.relenv:
python_executable = install_salt.install_dir / "Scripts" / "python.exe"
factory = salt_factories.salt_master_daemon(
random_string("master-"),
defaults=config_defaults,