← Back to branch summary

~ubuntu-branches/ubuntu/saucy/juju-core/saucy-updates

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/cmd/jujud/bootstrap.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-09-03 14:22:22 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20130903142222-9mes2r8wqr0bs7lp
Tags: 1.13.3-0ubuntu1
New upstream point release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/cmd/jujud/bootstrap.go
15
15
        "launchpad.net/juju-core/agent"
16
16
        "launchpad.net/juju-core/cmd"
17
17
        "launchpad.net/juju-core/constraints"
18
 
        "launchpad.net/juju-core/environs"
19
18
        "launchpad.net/juju-core/environs/bootstrap"
20
19
        "launchpad.net/juju-core/environs/cloudinit"
21
20
        "launchpad.net/juju-core/environs/config"
22
21
        "launchpad.net/juju-core/instance"
 
22
        "launchpad.net/juju-core/provider"
23
23
        "launchpad.net/juju-core/state"
24
24
)
25
25
 
96
96
                return fmt.Errorf("cannot read provider-state-url file: %v", err)
97
97
        }
98
98
        stateInfoURL := strings.Split(string(data), "\n")[0]
99
 
        bsState, err := environs.LoadStateFromURL(stateInfoURL)
 
99
        bsState, err := provider.LoadStateFromURL(stateInfoURL)
100
100
        if err != nil {
101
101
                return fmt.Errorf("cannot load state from URL %q (read from %q): %v", stateInfoURL, providerStateURLFile, err)
102
102
        }