~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/environs/config.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-29 11:40:20 UTC
  • mfrom: (23.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140129114020-ejieitm8smtt5vln
Tags: 1.17.1-0ubuntu2
d/tests/local-provider: Don't fail tests if ~/.juju is present as its
created by the juju version command. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
 
15
15
        "launchpad.net/juju-core/environs/config"
16
16
        "launchpad.net/juju-core/errors"
 
17
        "launchpad.net/juju-core/juju/osenv"
17
18
)
18
19
 
19
20
var logger = loggo.GetLogger("juju.environs")
159
160
 
160
161
func environsPath(path string) string {
161
162
        if path == "" {
162
 
                path = config.JujuHomePath("environments.yaml")
 
163
                path = osenv.JujuHomePath("environments.yaml")
163
164
        }
164
165
        return path
165
166
}