yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vms/run: make flake field option always have a value

Browse Source
This commit is contained in:
Jörg Thalheim
2023-12-08 12:08:37 +01:00
parent b9ca10c4da
commit 218478c801
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/vms/run.py
View File

@@ -273,16 +273,19 @@ def run_vm(
class RunOptions: class RunOptions:
machine: str machine: str
flake_url: str | None flake_url: str | None
flake: Path
nix_options: list[str] = field(default_factory=list) nix_options: list[str] = field(default_factory=list)
flake: Path | None = None
def run_command(args: argparse.Namespace) -> 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 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)) vm = asyncio.run(inspect_vm(flake_url=flake_url, flake_attr=run_options.machine))
run_vm(vm, run_options.nix_options) run_vm(vm, run_options.nix_options)