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

Assign arch outside of the ifs

Browse source
This commit is contained in:
MKLeb 2023-06-06 14:45:07 -04:00 • committed by Megan Wilhite
parent c0c5058156
commit 95d8e03a10
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/tests/download/test_pkg_download.py
View file

@ -399,8 +399,8 @@ def setup_macos(
package_type,
onedir_install_path,
):
arch = os.environ.get("SALT_REPO_ARCH") or "x86_64"
if package_type == "package":
arch = os.environ.get("SALT_REPO_ARCH") or "x86_64"
if arch == "aarch64":
arch = "arm64"
@ -458,10 +458,10 @@ def setup_windows(
onedir_install_path,
):
try:
arch = os.environ.get("SALT_REPO_ARCH") or "amd64"
if package_type == "package":
root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt")
arch = os.environ.get("SALT_REPO_ARCH") or "amd64"
if packaging.version.parse(salt_release) > packaging.version.parse("3005"):
if package_type.lower() == "nsis":
if arch.lower() != "x86":