~rogpeppe/juju-core/themue-058-debug-log-api

« back to all changes in this revision

Viewing changes to state/apiserver/client/run.go

  • Committer: Frank Mueller
  • Date: 2014-01-23 14:14:49 UTC
  • mfrom: (2152.1.95 juju-core)
  • Revision ID: frank.mueller@canonical.com-20140123141449-b30l57y7gs3wjkpw
debugger: merged trunk and fixed permission and interface problems

Show diffs side-by-side

added added

removed removed

Lines of Context:
106
106
                if err != nil {
107
107
                        return results, err
108
108
                }
109
 
                command := fmt.Sprintf("juju-run --no-context %s", quotedCommands)
 
109
                command := `[ -f "$HOME/.juju-proxy" ] && . "$HOME/.juju-proxy"`
 
110
                command += fmt.Sprintf("\njuju-run --no-context %s", quotedCommands)
110
111
                execParam := remoteParamsForMachine(machine, command, run.Timeout)
111
112
                params = append(params, execParam)
112
113
        }