← Back to branch summary

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

« back to all changes in this revision

Viewing changes to juju/api.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:
juju/api.go
14
14
        "launchpad.net/juju-core/environs/config"
15
15
        "launchpad.net/juju-core/environs/configstore"
16
16
        "launchpad.net/juju-core/errors"
 
17
        "launchpad.net/juju-core/juju/osenv"
17
18
        "launchpad.net/juju-core/names"
18
19
        "launchpad.net/juju-core/state/api"
19
20
        "launchpad.net/juju-core/state/api/keymanager"
100
101
}
101
102
 
102
103
func newAPIClient(envName string) (*api.State, error) {
103
 
        store, err := configstore.NewDisk(config.JujuHome())
 
104
        store, err := configstore.NewDisk(osenv.JujuHome())
104
105
        if err != nil {
105
106
                return nil, err
106
107
        }