Revision 61efb530 pithos/api/util.py
b/pithos/api/util.py | ||
---|---|---|
200 | 200 |
bytes = 0 |
201 | 201 |
try: |
202 | 202 |
src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest']) |
203 |
objects = request.backend.list_objects(request.user, v_account, |
|
203 |
objects = request.backend.list_objects(request.user_uniq, v_account,
|
|
204 | 204 |
src_container, prefix=src_name, virtual=False) |
205 | 205 |
for x in objects: |
206 |
src_meta = request.backend.get_object_meta(request.user, |
|
206 |
src_meta = request.backend.get_object_meta(request.user_uniq,
|
|
207 | 207 |
v_account, src_container, x[0], x[1]) |
208 | 208 |
hash += src_meta['hash'] |
209 | 209 |
bytes += src_meta['bytes'] |
... | ... | |
231 | 231 |
meta['X-Object-Sharing'] = '; '.join(ret) |
232 | 232 |
if '/'.join((v_account, v_container, v_object)) != perm_path: |
233 | 233 |
meta['X-Object-Shared-By'] = perm_path |
234 |
if request.user != v_account: |
|
234 |
if request.user_uniq != v_account:
|
|
235 | 235 |
meta['X-Object-Allowed-To'] = allowed |
236 | 236 |
|
237 | 237 |
def update_public_meta(public, meta): |
... | ... | |
295 | 295 |
src_version = request.META.get('HTTP_X_SOURCE_VERSION') |
296 | 296 |
try: |
297 | 297 |
if move: |
298 |
version_id = request.backend.move_object(request.user, src_account, src_container, src_name, |
|
298 |
version_id = request.backend.move_object(request.user_uniq, src_account, src_container, src_name,
|
|
299 | 299 |
dest_account, dest_container, dest_name, |
300 | 300 |
meta, False, permissions) |
301 | 301 |
else: |
302 |
version_id = request.backend.copy_object(request.user, src_account, src_container, src_name, |
|
302 |
version_id = request.backend.copy_object(request.user_uniq, src_account, src_container, src_name,
|
|
303 | 303 |
dest_account, dest_container, dest_name, |
304 | 304 |
meta, False, permissions, src_version) |
305 | 305 |
except NotAllowedError: |
... | ... | |
314 | 314 |
raise RequestEntityTooLarge('Quota exceeded') |
315 | 315 |
if public is not None: |
316 | 316 |
try: |
317 |
request.backend.update_object_public(request.user, dest_account, dest_container, dest_name, public) |
|
317 |
request.backend.update_object_public(request.user_uniq, dest_account, dest_container, dest_name, public)
|
|
318 | 318 |
except NotAllowedError: |
319 | 319 |
raise Forbidden('Not allowed') |
320 | 320 |
except NameError: |
Also available in: Unified diff