Skip to content

Commit

Permalink
Core: List global account usage crashes; Fix #3695
Browse files Browse the repository at this point in the history
  • Loading branch information
bari12 committed Aug 3, 2020
1 parent 510b935 commit 1cc4de1
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions lib/rucio/core/permission/generic.py
Expand Up @@ -891,12 +891,7 @@ def perm_get_global_account_usage(issuer, kwargs):
admin_in_country = set()
for kv in list_account_attributes(account=issuer):
if kv['key'].startswith('country-') and kv['value'] == 'admin':
admin_in_country.add(kv['key'].partition('-')[2])
resolved_rse_countries = {list_rse_attributes(rse_id=rse['rse_id']).get('country')
for rse in parse_expression(kwargs['rse_expression'], filter={'vo': issuer.vo})}

if resolved_rse_countries.issubset(admin_in_country):
return True
return True
return False


Expand Down

0 comments on commit 1cc4de1

Please sign in to comment.