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

clan-cli: Fix ignored debug flag in clan vms run, refactor Host.run to use RunOpts

Browse Source
This commit is contained in:
Qubasa
2024-12-03 16:01:51 +01:00
parent f033a193d5
commit 164c621dc0
14 changed files with 92 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/clan-cli/clan_cli/backups/list.py
View File

@@ -2,7 +2,7 @@ import argparse
import json
from dataclasses import dataclass
from clan_cli.cmd import Log
from clan_cli.cmd import Log, RunOpts
from clan_cli.completions import (
add_dynamic_completer,
complete_backup_providers_for_machine,
@@ -23,8 +23,7 @@ def list_provider(machine: Machine, provider: str) -> list[Backup]:
backup_metadata = json.loads(machine.eval_nix("config.clan.core.backups"))
proc = machine.target_host.run(
[backup_metadata["providers"][provider]["list"]],
log=Log.STDERR,
check=False,
RunOpts(log=Log.STDERR, check=False),
)
if proc.returncode != 0:
# TODO this should be a warning, only raise exception if no providers succeed

8
pkgs/clan-cli/clan_cli/backups/restore.py
View File

@@ -1,7 +1,7 @@
import argparse
import json
from clan_cli.cmd import Log
from clan_cli.cmd import Log, RunOpts
from clan_cli.completions import (
add_dynamic_completer,
complete_backup_providers_for_machine,
@@ -28,7 +28,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
if pre_restore := backup_folders[service]["preRestoreCommand"]:
proc = machine.target_host.run(
[pre_restore],
log=Log.STDERR,
RunOpts(log=Log.STDERR),
extra_env=env,
)
if proc.returncode != 0:
@@ -37,7 +37,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
proc = machine.target_host.run(
[backup_metadata["providers"][provider]["restore"]],
log=Log.STDERR,
RunOpts(log=Log.STDERR),
extra_env=env,
)
if proc.returncode != 0:
@@ -47,7 +47,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
if post_restore := backup_folders[service]["postRestoreCommand"]:
proc = machine.target_host.run(
[post_restore],
log=Log.STDERR,
RunOpts(log=Log.STDERR),
extra_env=env,
)
if proc.returncode != 0: