Skip to content

Commit

Permalink
Fixing variable name to avoid overlap
Browse files Browse the repository at this point in the history
Auto stash before rebase of "refs/heads/feature-3494"
  • Loading branch information
gabrielefronze committed May 22, 2020
1 parent 60f7f52 commit 7cf42a9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions lib/rucio/client/replicaclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ def add_replica(self, rse, scope, name, bytes, adler32=None, pfn=None, md5=None,
:return: True if files were created successfully.
"""
dict = {'scope': scope, 'name': name, 'bytes': bytes, 'meta': meta}
dictio = {'scope': scope, 'name': name, 'bytes': bytes, 'meta': meta}

set_replica_checksums(dict, md5=md5, adler32=adler32, pfn=pfn)
set_replica_checksums(dictio, md5=md5, adler32=adler32, pfn=pfn)

return self.add_replicas(rse=rse, files=[dict])
return self.add_replicas(rse=rse, files=[dictio])

def add_replicas(self, rse, files, ignore_availability=True):
"""
Expand Down
6 changes: 3 additions & 3 deletions lib/rucio/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,18 +295,18 @@ def set_checksum_value(file, checksum_names_list):
break


def set_replica_checksums(dict, **checksums):
def set_replica_checksums(dictio, **checksums):
"""
Utility to fill a replica dictionary with all the passed checksums, automatically excluding unsupported ones
:param dict: replica description dictionary.
:param dictio: replica description dictionary.
:param checksums: arbitrary number of checksum values. Passed variables must be named after the checksum algorithm name.
"""
for checksum_name in checksums:
if checksum_name in GLOBALLY_SUPPORTED_CHECKSUMS or checksum_name == 'pfn':
value = checksums[checksum_name]
if value:
dict[checksum_name] = value
dictio[checksum_name] = value


def adler32(file):
Expand Down

0 comments on commit 7cf42a9

Please sign in to comment.