nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-07-03 23:17:29 +02:00
parent d5ec5ed719
commit cc1dfc202f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/copy.scm
View File

@ -75,7 +75,8 @@ package names, build the underlying packages before sending them."
(and (or (assoc-ref opts 'dry-run?) (and (or (assoc-ref opts 'dry-run?)
(build-derivations local drv)) (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 (sent (send-files local items
(connect-to-remote-daemon session) (connect-to-remote-daemon session)
#:recursive? #t))) #:recursive? #t)))
@ -88,7 +89,7 @@ package names, build the underlying packages before sending them."
(let*-values (((user host port) (let*-values (((user host port)
(ssh-spec->user+host+port source)) (ssh-spec->user+host+port source))
((session) ((session)
(open-ssh-session host #:user user #:port port)) (open-ssh-session host #:user user #:port (or port 22)))
((remote) ((remote)
(connect-to-remote-daemon session))) (connect-to-remote-daemon session)))
(set-build-options-from-command-line local opts) (set-build-options-from-command-line local opts)