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

Remove some remaining fragments

Browse source
This commit is contained in:
Twangboy 2023-03-28 17:14:12 -06:00 • committed by Pedro Algarvio
parent 7f47174fab
commit 11e97b168f
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/windows/install_salt.ps1
View file

@ -97,7 +97,7 @@ if ( ! $SkipInstall ) {
Write-Host $("-" * 80)
#-------------------------------------------------------------------------------
# Installing Salt
# Preparing to Install Salt
#-------------------------------------------------------------------------------
# We don't want to use an existing salt installation because we don't know what
# it is

11
setup.py
View file

@ -368,12 +368,6 @@ class Develop(develop):
self.generate_salt_syspaths = True
def run(self):
if IS_WINDOWS_PLATFORM:
# Download the required DLLs
self.distribution.salt_download_windows_dlls = True
self.run_command("download-windows-dlls")
self.distribution.salt_download_windows_dlls = None
if self.write_salt_version is True:
self.distribution.running_salt_install = True
self.distribution.salt_version_hardcoded_path = SALT_VERSION_HARDCODED
@ -652,11 +646,6 @@ class Install(install):
self.distribution.salt_version_hardcoded_path = os.path.join(
self.build_lib, "salt", "_version.txt"
)
if IS_WINDOWS_PLATFORM:
# Download the required DLLs
self.distribution.salt_download_windows_dlls = True
self.run_command("download-windows-dlls")
self.distribution.salt_download_windows_dlls = None
# need to ensure _version.txt is created in build dir before install
if not os.path.exists(os.path.join(self.build_lib)):
if not self.skip_build: