From ef5d62a1c103778c62a5ffeb2615aa950ca8f5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 14 Apr 2025 13:59:52 +0200 Subject: [PATCH] don't error on macOS if sandbox for vars is missing --- pkgs/clan-cli/clan_cli/vars/generate.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index ff7e2ac23..7942df2d1 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/pkgs/clan-cli/clan_cli/vars/generate.py @@ -209,15 +209,19 @@ def execute_generator( final_script = generator.final_script() - if sys.platform == "linux" and bwrap.bubblewrap_works(): - cmd = bubblewrap_cmd(str(final_script), tmpdir) + if sys.platform == "linux": + if bwrap.bubblewrap_works(): + cmd = bubblewrap_cmd(str(final_script), tmpdir) + else: + if not no_sandbox: + msg = ( + f"Cannot safely execute generator {generator.name}: Sandboxing is not available on this system\n" + f"Re-run 'vars generate' with '--no-sandbox' to disable sandboxing" + ) + raise ClanError(msg) + cmd = ["bash", "-c", str(final_script)] else: - if not no_sandbox: - msg = ( - f"Cannot safely execute generator {generator.name}: Sandboxing is not available on this system\n" - f"Re-run 'vars generate' with '--no-sandbox' to disable sandboxing" - ) - raise ClanError(msg) + # TODO: implement sandboxing for macOS using sandbox-exec cmd = ["bash", "-c", str(final_script)] run(cmd, RunOpts(env=env)) files_to_commit = []