← Back to branch summary

~ubuntu-branches/ubuntu/trusty/cinder/trusty

« back to all changes in this revision

Viewing changes to cinder/api/contrib/types_extra_specs.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Yolanda Robla Mota, James Page, Chuck Short
  • Date: 2013-02-22 10:45:17 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20130222104517-ng3r6ace9vi4m869
Tags: 2013.1.g3-0ubuntu1
[ Yolanda Robla Mota ]
* d/control: Add BD on python-hp3parclient.
* d/patches: Drop patches related to disabling hp3parclient.

[ James Page ]
* d/control: Add Suggests: python-hp3parclient for python-cinder.
* d/control: Add BD on python-oslo-config.
* d/*: Wrapped and sorted.

[ Chuck Short ]
* New upstream release.
* debian/rules, debian/cinder-volumes.install: 
  - Fail if binaries are missing and install missing binaries.
* debian/patches/fix-ubuntu-tests.patch: Fix failing tests.
* debian/control: Add python-rtslib and python-mock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/api/contrib/types_extra_specs.py
95
95
        context = req.environ['cinder.context']
96
96
        authorize(context)
97
97
        if not body:
98
 
            raise webob.exc.HTTPUnprocessableEntity()
 
98
            expl = _('Request body empty')
 
99
            raise webob.exc.HTTPBadRequest(explanation=expl)
99
100
        self._check_type(context, type_id)
100
 
        if not id in body:
 
101
        if id not in body:
101
102
            expl = _('Request body and URI mismatch')
102
103
            raise webob.exc.HTTPBadRequest(explanation=expl)
103
104
        if len(body) > 1: