clan/clan-core
12
4
Fork 18
Code Issues 99 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

nix fmt
All checks were successful
checks-impure / test (pull_request) Successful in 13s
Details
checks / test (pull_request) Successful in 1m22s
Details

Browse Source
This commit is contained in:
Luis Hebendanz 2023-10-03 15:22:41 +02:00
parent 8fa241a36b
commit dbe289f702
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_cli/secrets/generate.py
View File

@ -8,7 +8,7 @@ from pathlib import Path
from clan_cli.errors import ClanError
from ..dirs import get_clan_flake_toplevel, module_root
from ..dirs import get_clan_flake_toplevel
from ..nix import nix_build, nix_config
log = logging.getLogger(__name__)
@ -35,7 +35,7 @@ def build_generate_script(machine: str, clan_dir: Path) -> str:
def run_generate_secrets(secret_generator_script: str, clan_dir: Path) -> None:
env = os.environ.copy()
env["CLAN_DIR"] = str(clan_dir)
env["PYTHONPATH"] = ":".join(sys.path) # TODO do this in the clanCore module
env["PYTHONPATH"] = ":".join(sys.path) # TODO do this in the clanCore module
print(f"generating secrets... {secret_generator_script}")
proc = subprocess.run(

4
pkgs/clan-cli/clan_cli/secrets/upload.py
View File

@ -3,12 +3,12 @@ import json
import logging
import os
import shlex
import sys
import subprocess
import sys
from pathlib import Path
from tempfile import TemporaryDirectory
from ..dirs import get_clan_flake_toplevel, module_root
from ..dirs import get_clan_flake_toplevel
from ..errors import ClanError
from ..nix import nix_build, nix_config, nix_shell
from ..ssh import parse_deployment_address