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

Side by Side Diff: cmd/juju/scp.go

Issue 78070043: cmd/juju: revert proxy changes in CLI
Patch Set: Created 10 years 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:
View unified diff | Download patch
« no previous file with comments | « [revision details] ('k') | cmd/juju/scp_test.go » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 if strings.HasPrefix(arg, "-") { 99 if strings.HasPrefix(arg, "-") {
100 if i != len(c.Args)-1 { 100 if i != len(c.Args)-1 {
101 return fmt.Errorf("unexpected argument %q; extra arguments must be last", arg) 101 return fmt.Errorf("unexpected argument %q; extra arguments must be last", arg)
102 } 102 }
103 extraArgs = append(extraArgs, arg) 103 extraArgs = append(extraArgs, arg)
104 } else { 104 } else {
105 // Local path 105 // Local path
106 targets = append(targets, arg) 106 targets = append(targets, arg)
107 } 107 }
108 } 108 }
109 109 » return ssh.Copy(targets, extraArgs, nil)
110 » var options *ssh.Options
111 » if c.proxy {
112 » » options = new(ssh.Options)
113 » » if err := c.setProxyCommand(options); err != nil {
114 » » » return err
115 » » }
116 » }
117 » return ssh.Copy(targets, extraArgs, options)
118 } 110 }
OLDNEW
« no previous file with comments | « [revision details] ('k') | cmd/juju/scp_test.go » ('j') | no next file with comments »

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