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

handle errors on removing paths on macos if they don't exist

Browse source
This commit is contained in:
MKLeb 2023-03-10 18:15:24 -05:00 • committed by Megan Wilhite
parent 9d80605623
commit 1e319f84fc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/pkg/build.py
View file

@ -350,9 +350,13 @@ def salt_onedir(
pip_bin = onedir_env / "bin" / "pip3"
ctx.run(str(pip_bin), "install", str(salt_archive))
if platform == "darwin":
shutil.rmtree(onedir_env / "opt")
shutil.rmtree(onedir_env / "etc")
shutil.rmtree(onedir_env / "Library")
def errfn(fn, path, err):
ctx.info(f"Removing {path} failed: {err}")
shutil.rmtree(onedir_env / "opt", onerror=errfn)
shutil.rmtree(onedir_env / "etc", onerror=errfn)
shutil.rmtree(onedir_env / "Library", onerror=errfn)
def _check_pkg_build_files_exist(ctx: Context, **kwargs):