~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/resource/api/server/upload.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
import (
7
7
        "io"
8
8
        "net/http"
 
9
        "path"
9
10
 
10
11
        "github.com/juju/errors"
11
12
        charmresource "gopkg.in/juju/charm.v6-unstable/resource"
104
105
                }
105
106
        }
106
107
 
 
108
        ext := path.Ext(res.Path)
 
109
        if path.Ext(uReq.Filename) != ext {
 
110
                return nil, errors.Errorf("incorrect extension on resource upload %q, expected %q", uReq.Filename, ext)
 
111
        }
 
112
 
107
113
        chRes, err := uh.updateResource(res.Resource, uReq.Fingerprint, uReq.Size)
108
114
        if err != nil {
109
115
                return nil, errors.Trace(err)