openstack/shade
Code Issues Proposed changes

Merge "Fix broken object hashing"

Browse Source
This commit is contained in:
Jenkins 2015-02-08 15:17:12 +00:00 committed by Gerrit Code Review
commit bd9eb86a50
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/__init__.py
View File

@ -36,8 +36,8 @@ import troveclient.client as trove_client
from shade import meta
__version__ = pbr.version.VersionInfo('shade').version_string()
OBJECT_MD5_KEY = 'x-shade-md5'
OBJECT_SHA256_KEY = 'x-shade-sha256'
OBJECT_MD5_KEY = 'x-object-meta-x-shade-md5'
OBJECT_SHA256_KEY = 'x-object-meta-x-shade-sha256'
IMAGE_MD5_KEY = 'org.openstack.shade.md5'
IMAGE_SHA256_KEY = 'org.openstack.shade.sha256'
@ -862,7 +862,7 @@ class OpenStackCloud(object):
md5.update(chunk)
sha256.update(chunk)
self._file_hash_cache[filename] = dict(
md5=md5.digest(), sha256=sha256.digest)
md5=md5.hexdigest(), sha256=sha256.hexdigest())
return (self._file_hash_cache[filename]['md5'],
self._file_hash_cache[filename]['sha256'])