~ruther/guix-local: copy: Default to port 22.

cc1dfc202f2fefb6c2eb9467d1fc90a9154550c9 — Ludovic Courtès 8 years ago d5ec5ed

copy: Default to port 22.

Failing to do that, "%p" would be "0" when using "ProxyCommand"
in ~/.ssh/config.

* guix/scripts/copy.scm (send-to-remote-host): Default to port 22.
(retrieve-from-remote-host): Likewise.

patch browse .tar.gz

1 files changed, 3 insertions(+), 2 deletions(-)

M guix/scripts/copy.scm

M guix/scripts/copy.scm => guix/scripts/copy.scm +3 -2

@@ 75,7 75,8 @@ package names, build the underlying packages before sending them."
 
       (and (or (assoc-ref opts 'dry-run?)
                (build-derivations local drv))
-           (let* ((session (open-ssh-session host #:user user #:port port))
+           (let* ((session (open-ssh-session host #:user user
+                                             #:port (or port 22)))
                   (sent    (send-files local items
                                        (connect-to-remote-daemon session)
                                        #:recursive? #t)))


@@ 88,7 89,7 @@ package names, build the underlying packages before sending them."
     (let*-values (((user host port)
                    (ssh-spec->user+host+port source))
                   ((session)
-                   (open-ssh-session host #:user user #:port port))
+                   (open-ssh-session host #:user user #:port (or port 22)))
                   ((remote)
                    (connect-to-remote-daemon session)))
       (set-build-options-from-command-line local opts)