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

rename run_no_output to run_no_stdout

Browse Source 
we want stderr for some nix commands.
This commit is contained in:
Jörg Thalheim
2024-12-03 17:14:27 +01:00
parent 181a325941
commit bbb2aca5cb
13 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/clan-cli/clan_cli/machines/hardware.py
View File

@@ -7,7 +7,7 @@ from pathlib import Path
from clan_cli.api import API
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import RunOpts, run, run_no_output
from clan_cli.cmd import RunOpts, run, run_no_stdout
from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.dirs import specific_machine_dir
from clan_cli.errors import ClanCmdError, ClanError
@@ -71,7 +71,7 @@ def show_machine_deployment_target(clan_dir: Path, machine_name: str) -> str | N
"--json",
]
)
proc = run_no_output(cmd)
proc = run_no_stdout(cmd)
res = proc.stdout.strip()
target_host = json.loads(res)
@@ -93,7 +93,7 @@ def show_machine_hardware_platform(clan_dir: Path, machine_name: str) -> str | N
"--json",
]
)
proc = run_no_output(cmd)
proc = run_no_stdout(cmd)
res = proc.stdout.strip()
host_platform = json.loads(res)

6
pkgs/clan-cli/clan_cli/machines/list.py
View File

@@ -7,7 +7,7 @@ from typing import Literal
from clan_cli.api import API
from clan_cli.api.modules import parse_frontmatter
from clan_cli.cmd import run_no_output
from clan_cli.cmd import run_no_stdout
from clan_cli.completions import add_dynamic_completer, complete_tags
from clan_cli.dirs import specific_machine_dir
from clan_cli.errors import ClanCmdError, ClanError
@@ -88,7 +88,7 @@ def list_nixos_machines(flake_url: str | Path) -> list[str]:
"--json",
]
)
proc = run_no_output(cmd)
proc = run_no_stdout(cmd)
try:
res = proc.stdout.strip()
@@ -142,7 +142,7 @@ def check_machine_online(
],
)
try:
proc = run_no_output(cmd, needs_user_terminal=True)
proc = run_no_stdout(cmd, needs_user_terminal=True)
if proc.returncode != 0:
return "Offline"
except ClanCmdError:

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

@@ -9,7 +9,7 @@ from tempfile import NamedTemporaryFile
from typing import TYPE_CHECKING, Any, Literal
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import run_no_output
from clan_cli.cmd import run_no_stdout
from clan_cli.errors import ClanError
from clan_cli.facts import public_modules as facts_public_modules
from clan_cli.facts import secret_modules as facts_secret_modules
@@ -70,7 +70,7 @@ class Machine:
attr = f'(builtins.getFlake "{self.flake}").nixosConfigurations.{self.name}.pkgs.hostPlatform.system'
output = self._eval_cache.get(attr)
if output is None:
output = run_no_output(
output = run_no_stdout(
nix_eval(["--impure", "--expr", attr])
).stdout.strip()
self._eval_cache[attr] = output
@@ -238,7 +238,7 @@ class Machine:
config_json.flush()
file_info = json.loads(
run_no_output(
run_no_stdout(
nix_eval(
[
"--impure",
@@ -283,9 +283,9 @@ class Machine:
args += nix_options + self.nix_options
if method == "eval":
output = run_no_output(nix_eval(args)).stdout.strip()
output = run_no_stdout(nix_eval(args)).stdout.strip()
return output
return Path(run_no_output(nix_build(args)).stdout.strip())
return Path(run_no_stdout(nix_build(args)).stdout.strip())
def eval_nix(
self,