← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-04-07 18:24:59 UTC
  • mfrom: (1.1.22)
  • Revision ID: package-import@ubuntu.com-20140407182459-1b6zvm5ygm4ki7yp
Tags: 1.18.0-0ubuntu1
https://launchpad.net/bugs/1287147
https://launchpad.net/bugs/1299588
https://launchpad.net/bugs/1301464
* New upstream release (LP: #1287147), including fixes for:
  - maas/lxc: LXC permission denied issue (LP: #1299588).
  - core: mega-watcher for machines does not include container
    addresses (LP: #1301464).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/cmd/juju/deploy.go
133
133
        if err != nil {
134
134
                return err
135
135
        }
136
 
        curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
 
136
 
 
137
        curl, err := resolveCharmURL(c.CharmName, client, conf)
137
138
        if err != nil {
138
139
                return err
139
140
        }
140
 
        repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
 
141
 
 
142
        repo, err := charm.InferRepository(curl.Reference, ctx.AbsPath(c.RepoPath))
141
143
        if err != nil {
142
144
                return err
143
145
        }
204
206
        if err != nil {
205
207
                return err
206
208
        }
207
 
        curl, err := charm.InferURL(c.CharmName, conf.DefaultSeries())
208
 
        if err != nil {
209
 
                return err
210
 
        }
211
 
        repo, err := charm.InferRepository(curl, ctx.AbsPath(c.RepoPath))
212
 
        if err != nil {
213
 
                return err
214
 
        }
215
 
 
 
209
 
 
210
        curl, err := resolveCharmURL1dot16(c.CharmName, conf)
 
211
        if err != nil {
 
212
                return err
 
213
        }
 
214
 
 
215
        repo, err := charm.InferRepository(curl.Reference, c.RepoPath)
 
216
        if err != nil {
 
217
                return err
 
218
        }
216
219
        repo = config.SpecializeCharmRepo(repo, conf)
217
220
 
218
221
        // TODO(fwereade) it's annoying to roundtrip the bytes through the client