Merge pull request 'installation: put use_tor option in right place' (#3680) from installation into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3680
This commit is contained in:
@@ -163,6 +163,7 @@ def install_command(args: argparse.Namespace) -> None:
|
|||||||
target_host = args.target_host
|
target_host = args.target_host
|
||||||
deploy_info: DeployInfo | None = ssh_command_parse(args)
|
deploy_info: DeployInfo | None = ssh_command_parse(args)
|
||||||
|
|
||||||
|
use_tor = False
|
||||||
if deploy_info and not args.target_host:
|
if deploy_info and not args.target_host:
|
||||||
host = find_reachable_host(deploy_info, host_key_check)
|
host = find_reachable_host(deploy_info, host_key_check)
|
||||||
if host is None:
|
if host is None:
|
||||||
@@ -184,7 +185,6 @@ def install_command(args: argparse.Namespace) -> None:
|
|||||||
nix_options=args.option,
|
nix_options=args.option,
|
||||||
override_target_host=target_host,
|
override_target_host=target_host,
|
||||||
)
|
)
|
||||||
use_tor = False
|
|
||||||
|
|
||||||
if machine._class_ == "darwin":
|
if machine._class_ == "darwin":
|
||||||
msg = "Installing macOS machines is not yet supported"
|
msg = "Installing macOS machines is not yet supported"
|
||||||
|
|||||||
@@ -223,7 +223,6 @@ class Machine:
|
|||||||
def eval_nix(
|
def eval_nix(
|
||||||
self,
|
self,
|
||||||
attr: str,
|
attr: str,
|
||||||
refresh: bool = False,
|
|
||||||
extra_config: None | dict = None,
|
extra_config: None | dict = None,
|
||||||
nix_options: list[str] | None = None,
|
nix_options: list[str] | None = None,
|
||||||
) -> Any:
|
) -> Any:
|
||||||
|
|||||||
Reference in New Issue
Block a user