Merge pull request #6203 from garetharmstronghp/fix_rpm_key_issue_5621
Fix issue #5621, rpm_key doesn't work for el5
This commit is contained in:
commit
0939a83174
1 changed files with 5 additions and 3 deletions
|
@ -138,7 +138,9 @@ class RpmKey:
|
||||||
def normalize_keyid(self, keyid):
|
def normalize_keyid(self, keyid):
|
||||||
"""Ensure a keyid doesn't have a leading 0x, has leading or trailing whitespace, and make sure is lowercase"""
|
"""Ensure a keyid doesn't have a leading 0x, has leading or trailing whitespace, and make sure is lowercase"""
|
||||||
ret = keyid.strip().lower()
|
ret = keyid.strip().lower()
|
||||||
if ret.startswith(('0x', '0X')):
|
if ret.startswith('0x'):
|
||||||
|
return ret[2:]
|
||||||
|
elif ret.startswith('0X'):
|
||||||
return ret[2:]
|
return ret[2:]
|
||||||
else:
|
else:
|
||||||
return ret
|
return ret
|
||||||
|
@ -148,9 +150,9 @@ class RpmKey:
|
||||||
stdout, stderr = self.execute_command([gpg, '--no-tty', '--batch', '--with-colons', '--fixed-list-mode', '--list-packets', keyfile])
|
stdout, stderr = self.execute_command([gpg, '--no-tty', '--batch', '--with-colons', '--fixed-list-mode', '--list-packets', keyfile])
|
||||||
for line in stdout.splitlines():
|
for line in stdout.splitlines():
|
||||||
line = line.strip()
|
line = line.strip()
|
||||||
if line.startswith('keyid:'):
|
if line.startswith(':signature packet:'):
|
||||||
# We want just the last 8 characters of the keyid
|
# We want just the last 8 characters of the keyid
|
||||||
keyid = line.split(':')[1].strip()[8:]
|
keyid = line.split()[-1].strip()[8:]
|
||||||
return keyid
|
return keyid
|
||||||
self.json_fail(msg="Unexpected gpg output")
|
self.json_fail(msg="Unexpected gpg output")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue