Commit 9a22d5b6 authored by Antony Chazapis's avatar Antony Chazapis

Fix conflict response when copying/moving.

parent 1b9a9f38
......@@ -303,7 +303,7 @@ def copy_or_move_object(request, src_account, src_container, src_name, dest_acco
except ValueError:
raise BadRequest('Invalid sharing header')
except AttributeError, e:
raise Conflict(json.dumps(e.data))
raise Conflict('\n'.join(e.data) + '\n')
if public is not None:
try:
request.backend.update_object_public(request.user, dest_account, dest_container, dest_name, public)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment