← Back to branch summary

~bac/juju-charmstore/v4

« back to all changes in this revision

Viewing changes to internal/v4/api.go

  • Committer: GitHub
  • Author(s): jujugui
  • Date: 2018-02-20 12:09:00 UTC
  • mfrom: (698.1.4)
  • Revision ID: git-v1:925d3c2cb8b80f34cb7877009a88f2f176e239b3
Merge pull request #784 from Veebers/update-for-juju-utils

Bump juju/utils dependency w/ fixes.

Bumped juju/utils version in juju/juju which broke charmstore.v5-unstable due to API changes.

Update charmstore.v5-unstable in regards to those API changes (as well as bump the juju/utils version to match too).

Show diffs side-by-side

added added

removed removed

Lines of Context:
internal/v4/api.go
8
8
        "net/http"
9
9
        "net/url"
10
10
 
11
 
        "github.com/juju/httprequest"
12
11
        "github.com/juju/loggo"
13
12
        "github.com/juju/mempool"
 
13
        "golang.org/x/net/context"
14
14
        "gopkg.in/errgo.v1"
 
15
        "gopkg.in/httprequest.v1"
15
16
        "gopkg.in/juju/charm.v6-unstable"
16
17
        "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
17
18
        "gopkg.in/mgo.v2"
56
57
func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
57
58
        rh, err := h.NewReqHandler(req)
58
59
        if err != nil {
59
 
                router.WriteError(w, err)
 
60
                router.WriteError(context.TODO(), w, err)
60
61
                return
61
62
        }
62
63
        defer rh.Close()