diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-11-25 22:47:37 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-25 23:44:21 +0100 |
commit | bc1ad4e334fbf5239ed8d617751e9fa7dbe0ab23 (patch) | |
tree | 9fb2c1884267522a1f55e71151f6600407b01f3a | |
parent | cf283dd92eb5ef2dee4b761bb23f6dca2525cd55 (diff) | |
download | gnu-guix-bc1ad4e334fbf5239ed8d617751e9fa7dbe0ab23.tar gnu-guix-bc1ad4e334fbf5239ed8d617751e9fa7dbe0ab23.tar.gz |
offload: Drop 'remote-pipe'.
* guix/scripts/offload.scm (remote-pipe): Remove.
(machine-load): Use 'open-remote-pipe*' instead of 'remote-pipe'.
-rw-r--r-- | guix/scripts/offload.scm | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 1821bb5b7a..2e0268020c 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -249,26 +249,6 @@ an SSH session. Return a <nix-server> object." (object->string redirect))))) (open-connection #:port channel))) -(define* (remote-pipe session command - #:key (quote? #t)) - "Run COMMAND (a list) on SESSION, and return an open input/output port, -which is also an SSH channel. When QUOTE? is true, perform shell-quotation of -all the elements of COMMAND." - (define (shell-quote str) - ;; Sort-of shell-quote STR so it can be passed as an argument to the - ;; shell. - (with-output-to-string - (lambda () - (write str)))) - - (let* ((channel (make-channel session))) - (channel-open-session channel) - (channel-request-exec channel - (string-join (if quote? - (map shell-quote command) - command))) - channel)) - ;;; ;;; Synchronization. @@ -511,7 +491,8 @@ be read." "Return the load of MACHINE, divided by the number of parallel builds allowed on MACHINE." (let* ((session (open-ssh-session machine)) - (pipe (remote-pipe session '("cat" "/proc/loadavg"))) + (pipe (open-remote-pipe* session OPEN_READ + "cat" "/proc/loadavg")) (line (read-line pipe))) (close-port pipe) |