Revision 038f1ae9

b/docs/source/devguide.rst
618 618
409 (Conflict)               The object can not be created from the provided hashmap, or there are conflicting permissions (a list of missing hashes, or a conflicting sharing path will be included in the reply - in JSON format)
619 619
411 (Length Required)        Missing ``Content-Length`` or ``Content-Type`` in the request
620 620
422 (Unprocessable Entity)   The MD5 checksum of the data written to the storage system does not match the (optionally) supplied ETag value
621
409 (Conflict)               Conflict with the current state of the resource
622 621
===========================  ==============================
623 622

  
624 623

  
b/pithos/api/functions.py
215 215
            try:
216 216
                meta = backend.get_container_meta(request.user, v_account, x[0], until)
217 217
                policy = backend.get_container_policy(request.user, v_account, x[0])
218
                for k, v in policy.iteritems():
219
                    meta['X-Container-Policy-' + k] = v
220
                container_meta.append(printable_header_dict(meta))
221 218
            except NotAllowedError:
222 219
                raise Unauthorized('Access denied')
223 220
            except NameError:
224 221
                pass
222
            else:
223
                for k, v in policy.iteritems():
224
                    meta['X-Container-Policy-' + k] = v
225
                container_meta.append(printable_header_dict(meta))
225 226
    if request.serialization == 'xml':
226 227
        data = render_to_string('containers.xml', {'account': v_account, 'containers': container_meta})
227 228
    elif request.serialization  == 'json':
......
420 421
                raise Unauthorized('Access denied')
421 422
            except NameError:
422 423
                pass
423
            update_sharing_meta(permissions, v_account, v_container, x[0], meta)
424
            update_public_meta(public, meta)
425
            object_meta.append(printable_header_dict(meta))
424
            else:
425
                update_sharing_meta(permissions, v_account, v_container, x[0], meta)
426
                update_public_meta(public, meta)
427
                object_meta.append(printable_header_dict(meta))
426 428
    if request.serialization == 'xml':
427 429
        data = render_to_string('objects.xml', {'container': v_container, 'objects': object_meta})
428 430
    elif request.serialization  == 'json':

Also available in: Unified diff