Stop setting default capabilities in get_named_key.
When get_named_key is called on a keyring that has customised capabilities, it overwrites the capabilities to the default capabilities. Depends-On: I777650ae2194609a95e5cfb101e343824b3d0a34 Change-Id: I2930b32943fb75778cf3b56bb7f1d2a9f9c7c454
This commit is contained in:
parent
9e5f668299
commit
04a9c98dfa
|
@ -1229,12 +1229,6 @@ def get_named_key(name, caps=None, pool_list=None):
|
|||
'get',
|
||||
key_name,
|
||||
]).decode('UTF-8')).strip()
|
||||
# NOTE(jamespage);
|
||||
# Apply any changes to key capabilities, dealing with
|
||||
# upgrades which requires new caps for operation.
|
||||
upgrade_key_caps(key_name,
|
||||
caps or _default_caps,
|
||||
pool_list)
|
||||
return parse_key(output)
|
||||
except subprocess.CalledProcessError:
|
||||
# Couldn't get the key, time to create it!
|
||||
|
|
Loading…
Reference in New Issue