← Back to branch summary

~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/private/client/client.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:
src/github.com/juju/juju/resource/api/private/client/client.go
10
10
 
11
11
        "github.com/juju/errors"
12
12
 
13
 
        "github.com/juju/juju/apiserver/common"
14
13
        "github.com/juju/juju/resource"
15
14
        "github.com/juju/juju/resource/api"
16
15
        "github.com/juju/juju/resource/api/private"
88
87
                return resource.Resource{}, errors.Annotate(err, "could not get resource info")
89
88
        }
90
89
        if response.Error != nil {
91
 
                err := common.RestoreError(response.Error)
 
90
                err := api.RestoreError(response.Error)
92
91
                return resource.Resource{}, errors.Annotate(err, "request failed on server")
93
92
        }
94
93
 
96
95
                return resource.Resource{}, errors.New("got bad response from API server")
97
96
        }
98
97
        if response.Resources[0].Error != nil {
99
 
                err := common.RestoreError(response.Error)
 
98
                err := api.RestoreError(response.Error)
100
99
                return resource.Resource{}, errors.Annotate(err, "request failed for resource")
101
100
        }
102
101
        res, err := api.API2Resource(response.Resources[0].Resource)