openstack/swift
Code Issues Proposed changes

Merge "Rename param to avoid use of built-in name hash"

Browse Source
This commit is contained in:
Jenkins 2013-09-05 01:12:06 +00:00 committed by Gerrit Code Review
commit 1c74962ec9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/common/utils.py
View File

@ -1140,16 +1140,16 @@ def whataremyips():
return addresses
def storage_directory(datadir, partition, hash):
def storage_directory(datadir, partition, name_hash):
"""
Get the storage directory
:param datadir: Base data directory
:param partition: Partition
:param hash: Account, container or object hash
:param name_hash: Account, container or object name hash
:returns: Storage directory
"""
return os.path.join(datadir, str(partition), hash[-3:], hash)
return os.path.join(datadir, str(partition), name_hash[-3:], name_hash)
def hash_path(account, container=None, object=None, raw_digest=False):