From 218478c801d4d3ce45edef404087546f646c50bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Dec 2023 12:08:37 +0100 Subject: [PATCH] vms/run: make flake field option always have a value --- pkgs/clan-cli/clan_cli/vms/run.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index fb7857b86..f6b55fce3 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/pkgs/clan-cli/clan_cli/vms/run.py @@ -273,16 +273,19 @@ def run_vm( class RunOptions: machine: str flake_url: str | None + flake: Path nix_options: list[str] = field(default_factory=list) - flake: Path | None = None def run_command(args: argparse.Namespace) -> None: - run_options = RunOptions(args.machine, args.flake_url, args.option, args.flake) + run_options = RunOptions( + machine=args.machine, + flake_url=args.flake_url, + flake=args.flake or Path.cwd(), + nix_options=args.option, + ) flake_url = run_options.flake_url or run_options.flake - if not flake_url: - flake_url = Path.cwd() vm = asyncio.run(inspect_vm(flake_url=flake_url, flake_attr=run_options.machine)) run_vm(vm, run_options.nix_options)