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

Merge pull request 'only accept eval/build for nix command' (#2030) from Mic92-type-checking into main

Browse Source
This commit is contained in:
clan-bot
2024-09-03 08:59:11 +00:00
parent 71705f8a51 e6ae896ba1
commit 3bb1efe479
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_cli/flash.py
View File

@@ -45,7 +45,7 @@ def list_possible_keymaps() -> list[str]:
if not keymaps_dir.exists(): if not keymaps_dir.exists():
msg = f"Keymaps directory '{keymaps_dir}' does not exist." msg = f"Keymaps directory '{keymaps_dir}' does not exist."
raise FileNotFoundError(msg) raise ClanError(msg)
keymap_files = [] keymap_files = []
@@ -67,7 +67,7 @@ def list_possible_languages() -> list[str]:
if not locale_file.exists(): if not locale_file.exists():
msg = f"Locale file '{locale_file}' does not exist." msg = f"Locale file '{locale_file}' does not exist."
raise FileNotFoundError(msg) raise ClanError(msg)
with locale_file.open() as f: with locale_file.open() as f:
lines = f.readlines() lines = f.readlines()

8
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@@ -140,7 +140,7 @@ class Machine:
def nix( def nix(
self, self,
method: str, method: Literal["eval", "build"],
attr: str, attr: str,
extra_config: None | dict = None, extra_config: None | dict = None,
impure: bool = False, impure: bool = False,
@@ -217,11 +217,7 @@ class Machine:
if method == "eval": if method == "eval":
output = run_no_stdout(nix_eval(args)).stdout.strip() output = run_no_stdout(nix_eval(args)).stdout.strip()
return output return output
if method == "build": return Path(run_no_stdout(nix_build(args)).stdout.strip())
outpath = run_no_stdout(nix_build(args)).stdout.strip()
return Path(outpath)
msg = f"Unknown method {method}"
raise ValueError(msg)
def eval_nix( def eval_nix(
self, self,