Merge pull request 'don't error on macOS if sandbox for vars is missing' (#3309) from macos-sandbox into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3309
This commit is contained in:
Mic92
2025-04-14 12:24:49 +00:00

View File

@@ -209,7 +209,8 @@ def execute_generator(
final_script = generator.final_script()
if sys.platform == "linux" and bwrap.bubblewrap_works():
if sys.platform == "linux":
if bwrap.bubblewrap_works():
cmd = bubblewrap_cmd(str(final_script), tmpdir)
else:
if not no_sandbox:
@@ -219,6 +220,9 @@ def execute_generator(
)
raise ClanError(msg)
cmd = ["bash", "-c", str(final_script)]
else:
# TODO: implement sandboxing for macOS using sandbox-exec
cmd = ["bash", "-c", str(final_script)]
run(cmd, RunOpts(env=env))
files_to_commit = []
# store secrets