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

add RET, Q, RSE lint

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-02 15:58:49 +02:00
parent ddab0a66c8
commit ad3daa3ce4
31 changed files with 201 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/machines/install.py
View File

@@ -145,7 +145,7 @@ def install_command(args: argparse.Namespace) -> None:
if not args.yes:
ask = input(f"Install {args.machine} to {target_host}? [y/N] ")
if ask != "y":
return
return None
return install_machine(
InstallOptions(

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

@@ -110,11 +110,10 @@ class Machine:
def flake_dir(self) -> Path:
if self.flake.is_local():
return self.flake.path
elif self.flake.is_remote():
if self.flake.is_remote():
return Path(nix_metadata(self.flake.url)["path"])
else:
msg = f"Unsupported flake url: {self.flake}"
raise ClanError(msg)
msg = f"Unsupported flake url: {self.flake}"
raise ClanError(msg)
@property
def target_host(self) -> Host:
@@ -218,12 +217,11 @@ class Machine:
if method == "eval":
output = run_no_stdout(nix_eval(args)).stdout.strip()
return output
elif method == "build":
if method == "build":
outpath = run_no_stdout(nix_build(args)).stdout.strip()
return Path(outpath)
else:
msg = f"Unknown method {method}"
raise ValueError(msg)
msg = f"Unknown method {method}"
raise ValueError(msg)
def eval_nix(
self,
@@ -246,9 +244,8 @@ class Machine:
if isinstance(output, str):
self._eval_cache[attr] = output
return output
else:
msg = "eval_nix returned not a string"
raise ClanError(msg)
msg = "eval_nix returned not a string"
raise ClanError(msg)
def build_nix(
self,
@@ -272,6 +269,5 @@ class Machine:
if isinstance(output, Path):
self._build_cache[attr] = output
return output
else:
msg = "build_nix returned not a Path"
raise ClanError(msg)
msg = "build_nix returned not a Path"
raise ClanError(msg)