mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Make deleting keys with user/gnupghome possible
This commit is contained in:
parent
702a899a15
commit
6f1a821000
3 changed files with 6 additions and 5 deletions
1
changelog/63159.fixed
Normal file
1
changelog/63159.fixed
Normal file
|
@ -0,0 +1 @@
|
|||
Fixed gpg.absent with gnupghome/user, fixed gpg.delete_key with gnupghome
|
|
@ -556,7 +556,7 @@ def delete_key(
|
|||
return ret
|
||||
|
||||
gpg = _create_gpg(user, gnupghome)
|
||||
key = get_key(keyid, fingerprint, user)
|
||||
key = get_key(keyid=keyid, fingerprint=fingerprint, user=user, gnupghome=gnupghome)
|
||||
|
||||
def __delete_key(fingerprint, secret, use_passphrase):
|
||||
if use_passphrase:
|
||||
|
|
|
@ -178,7 +178,7 @@ def absent(name, keys=None, user=None, gnupghome=None, **kwargs):
|
|||
|
||||
ret = {"name": name, "result": True, "changes": {}, "comment": []}
|
||||
|
||||
_current_keys = __salt__["gpg.list_keys"]()
|
||||
_current_keys = __salt__["gpg.list_keys"](user=user, gnupghome=gnupghome)
|
||||
|
||||
current_keys = []
|
||||
for key in _current_keys:
|
||||
|
@ -198,9 +198,9 @@ def absent(name, keys=None, user=None, gnupghome=None, **kwargs):
|
|||
salt.utils.dictupdate.append_dict_key_value(ret, "changes:deleted", key)
|
||||
continue
|
||||
result = __salt__["gpg.delete_key"](
|
||||
key,
|
||||
user,
|
||||
gnupghome,
|
||||
keyid=key,
|
||||
user=user,
|
||||
gnupghome=gnupghome,
|
||||
)
|
||||
if result["res"] is False:
|
||||
ret["result"] = result["res"]
|
||||
|
|
Loading…
Add table
Reference in a new issue