Commit a09c3fd8 authored by Chrysostomos Nanakos's avatar Chrysostomos Nanakos
Browse files

pithos: Suppress value from modular backend

Suppress 'is_snapshot' return value from modular backend
get_object_hashmap function.
parent cfa3bba0
......@@ -39,7 +39,7 @@ def update_md5(m):
meta = backend.get_object_meta(
account, account, container, name, 'pithos', version)
if meta['checksum'] == '':
size, hashmap = backend.get_object_hashmap(
_, size, hashmap = backend.get_object_hashmap(
account, account, container, name, version)
checksum = hashmap_md5(backend, hashmap, size)
backend.update_object_checksum(
......
......@@ -75,9 +75,8 @@ class Command(SynnefoCommand):
update_public_meta(public, kv)
if options['hashmap']:
_, kv['hashmap'] = b.get_object_hashmap(account, account,
container, name,
options['obj_version'])
_, size, kv['hashmap'] = b.get_object_hashmap(
account, account, container, name, options['obj_version'])
utils.pprint_table(self.stdout, [kv.values()], kv.keys(),
options["output_format"], vertical=True)
......
......@@ -124,17 +124,17 @@ def public_read(request, v_public):
try:
for x in objects:
s, h = request.backend.get_object_hashmap(request.user_uniq,
v_account,
src_container,
x[0], x[1])
_, s, h = request.backend.get_object_hashmap(request.user_uniq,
v_account,
src_container,
x[0], x[1])
sizes.append(s)
hashmaps.append(h)
except:
raise faults.ItemNotFound('Object does not exist')
else:
try:
s, h = request.backend.get_object_hashmap(
_, s, h = request.backend.get_object_hashmap(
request.user_uniq, v_account,
v_container, v_object)
sizes.append(s)
......
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