[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36955] [PATCH] machine: Add 'build-locally?' field for managed host
From: |
Christopher Lemmer Webber |
Subject: |
[bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts. |
Date: |
Wed, 07 Aug 2019 15:20:59 -0400 |
User-agent: |
mu4e 1.2.0; emacs 26.2 |
Looks good, though I assume this is a dependency for another patch
that's coming?
Jakob L. Kreuze writes:
> * gnu/machine/ssh.scm (machine-ssh-configuration-build-locally?): New
> variable.
> (managed-host-remote-eval): Pass 'build-locally?' to 'remote-eval'.
> ---
> gnu/machine/ssh.scm | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
> index ae312597dd..1f16d9a5ea 100644
> --- a/gnu/machine/ssh.scm
> +++ b/gnu/machine/ssh.scm
> @@ -47,6 +47,7 @@
> machine-ssh-configuration
>
> machine-ssh-configuration-host-name
> + machine-ssh-configuration-build-locally?
> machine-ssh-configuration-port
> machine-ssh-configuration-user
> machine-ssh-configuration-session))
> @@ -69,15 +70,17 @@
> make-machine-ssh-configuration
> machine-ssh-configuration?
> this-machine-ssh-configuration
> - (host-name machine-ssh-configuration-host-name) ; string
> - (port machine-ssh-configuration-port ; integer
> - (default 22))
> - (user machine-ssh-configuration-user ; string
> - (default "root"))
> - (identity machine-ssh-configuration-identity ; path to a private key
> - (default #f))
> - (session machine-ssh-configuration-session ; session
> - (default #f)))
> + (host-name machine-ssh-configuration-host-name) ; string
> + (build-locally? machine-ssh-configuration-build-locally?
> + (default #t))
> + (port machine-ssh-configuration-port ; integer
> + (default 22))
> + (user machine-ssh-configuration-user ; string
> + (default "root"))
> + (identity machine-ssh-configuration-identity ; path to a private
> key
> + (default #f))
> + (session machine-ssh-configuration-session ; session
> + (default #f)))
>
> (define (machine-ssh-session machine)
> "Return the SSH session that was given in MACHINE's configuration, or
> create
> @@ -103,7 +106,10 @@ one from the configuration's parameters if one was not
> provided."
> "Internal implementation of 'machine-remote-eval' for MACHINE instances
> with
> an environment type of 'managed-host."
> (maybe-raise-unsupported-configuration-error machine)
> - (remote-eval exp (machine-ssh-session machine)))
> + (remote-eval exp (machine-ssh-session machine)
> + #:build-locally?
> + (machine-ssh-configuration-build-locally?
> + (machine-configuration machine))))
>
>
> ;;;