diff --git a/pkgs/clan-cli/clan_cli/secrets/generate.py b/pkgs/clan-cli/clan_cli/secrets/generate.py index 24a58681c..8433200f0 100644 --- a/pkgs/clan-cli/clan_cli/secrets/generate.py +++ b/pkgs/clan-cli/clan_cli/secrets/generate.py @@ -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( diff --git a/pkgs/clan-cli/clan_cli/secrets/upload.py b/pkgs/clan-cli/clan_cli/secrets/upload.py index 74c651cbe..69ff7bcee 100644 --- a/pkgs/clan-cli/clan_cli/secrets/upload.py +++ b/pkgs/clan-cli/clan_cli/secrets/upload.py @@ -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