mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
parent
b3c0e3e45e
commit
808d9596b2
1 changed files with 2 additions and 2 deletions
|
@ -86,7 +86,7 @@ class RpmKey:
|
||||||
keyfile = self.fetch_key(key)
|
keyfile = self.fetch_key(key)
|
||||||
keyid = self.getkeyid(keyfile)
|
keyid = self.getkeyid(keyfile)
|
||||||
should_cleanup_keyfile = True
|
should_cleanup_keyfile = True
|
||||||
elif is_keyid(key):
|
elif self.is_keyid(key):
|
||||||
keyid = key
|
keyid = key
|
||||||
elif os.path.isfile(key):
|
elif os.path.isfile(key):
|
||||||
keyfile = key
|
keyfile = key
|
||||||
|
@ -147,7 +147,7 @@ class RpmKey:
|
||||||
return keyid
|
return keyid
|
||||||
self.json_fail(msg="Unexpected gpg output")
|
self.json_fail(msg="Unexpected gpg output")
|
||||||
|
|
||||||
def is_keyid(keystr):
|
def is_keyid(self, keystr):
|
||||||
"""Verifies if a key, as provided by the user is a keyid"""
|
"""Verifies if a key, as provided by the user is a keyid"""
|
||||||
return re.match('(0x)?(0-9a-f){8}', keystr, flags=re.IGNORECASE)
|
return re.match('(0x)?(0-9a-f){8}', keystr, flags=re.IGNORECASE)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue