Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1062)

Delta Between Two Patch Sets: cmd/juju/scp.go

Issue 97230043: cmd/juju: check use-proxy before resolving address
Left Patch Set: Created 9 years, 10 months ago
Right Patch Set: cmd/juju: check use-proxy before resolving address Created 9 years, 10 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « cmd/juju/debughooks_test.go ('k') | cmd/juju/scp_test.go » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 // Copyright 2012, 2013 Canonical Ltd. 1 // Copyright 2012, 2013 Canonical Ltd.
2 // Licensed under the AGPLv3, see LICENCE file for details. 2 // Licensed under the AGPLv3, see LICENCE file for details.
3 3
4 package main 4 package main
5 5
6 import ( 6 import (
7 "fmt" 7 "fmt"
8 "strings" 8 "strings"
9 9
10 "launchpad.net/juju-core/cmd" 10 "launchpad.net/juju-core/cmd"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // Run resolves c.Target to a machine, or host of a unit and 96 // Run resolves c.Target to a machine, or host of a unit and
97 // forks ssh with c.Args, if provided. 97 // forks ssh with c.Args, if provided.
98 func (c *SCPCommand) Run(ctx *cmd.Context) error { 98 func (c *SCPCommand) Run(ctx *cmd.Context) error {
99 var err error 99 var err error
100 c.apiClient, err = c.initAPIClient() 100 c.apiClient, err = c.initAPIClient()
101 if err != nil { 101 if err != nil {
102 return err 102 return err
103 } 103 }
104 defer c.apiClient.Close() 104 defer c.apiClient.Close()
105 105
106 » var options *ssh.Options 106 » options, err := c.getSSHOptions(false)
107 » if c.proxy, err = c.proxySSH(); err != nil { 107 » if err != nil {
108 return err 108 return err
109 } else if c.proxy {
110 options = new(ssh.Options)
111 if err := c.setProxyCommand(options); err != nil {
112 return err
113 }
114 } 109 }
115 args, err := expandArgs(c.Args, c.hostFromTarget) 110 args, err := expandArgs(c.Args, c.hostFromTarget)
116 if err != nil { 111 if err != nil {
117 return err 112 return err
118 } 113 }
119 return ssh.Copy(args, options) 114 return ssh.Copy(args, options)
120 } 115 }
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b