clan-cli: clan_cli.bwrap -> clan_lib.bwrap
This commit is contained in:
@@ -104,7 +104,7 @@ def generate_service_facts(
|
|||||||
service, machine.facts_data[service]["generator"]["prompt"]
|
service, machine.facts_data[service]["generator"]["prompt"]
|
||||||
)
|
)
|
||||||
env["prompt_value"] = prompt_value
|
env["prompt_value"] = prompt_value
|
||||||
from clan_cli import bwrap
|
from clan_lib import bwrap
|
||||||
|
|
||||||
if sys.platform == "linux" and bwrap.bubblewrap_works():
|
if sys.platform == "linux" and bwrap.bubblewrap_works():
|
||||||
cmd = bubblewrap_cmd(generator, facts_dir, secrets_dir)
|
cmd = bubblewrap_cmd(generator, facts_dir, secrets_dir)
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ def execute_generator(
|
|||||||
prompt_file = tmpdir_prompts / prompt.name
|
prompt_file = tmpdir_prompts / prompt.name
|
||||||
value = get_prompt_value(prompt.name)
|
value = get_prompt_value(prompt.name)
|
||||||
prompt_file.write_text(value)
|
prompt_file.write_text(value)
|
||||||
from clan_cli import bwrap
|
from clan_lib import bwrap
|
||||||
|
|
||||||
final_script = generator.final_script()
|
final_script = generator.final_script()
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from clan_cli.bwrap import bubblewrap_works
|
from clan_lib.bwrap import bubblewrap_works
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(sys.platform != "linux", reason="bubblewrap only works on linux")
|
@pytest.mark.skipif(sys.platform != "linux", reason="bubblewrap only works on linux")
|
||||||
Reference in New Issue
Block a user