← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to cmd/juju/ssh.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/ssh.go
72
72
func (c *SSHCommon) hostFromTarget(target string) (string, error) {
73
73
        // is the target the id of a machine ?
74
74
        if state.IsMachineId(target) {
75
 
                log.Infof("cmd/juju: looking up address for machine %s...", target)
 
75
                log.Infof("looking up address for machine %s...", target)
76
76
                // TODO(dfc) maybe we should have machine.PublicAddress() ?
77
77
                return c.machinePublicAddress(target)
78
78
        }
79
79
        // maybe the target is a unit ?
80
80
        if state.IsUnitName(target) {
81
 
                log.Infof("cmd/juju: looking up address for unit %q...", c.Target)
 
81
                log.Infof("looking up address for unit %q...", c.Target)
82
82
                unit, err := c.State.Unit(target)
83
83
                if err != nil {
84
84
                        return "", err