cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6203 from garetharmstronghp/fix_rpm_key_issue_5621

Browse source 
Fix issue #5621, rpm_key doesn't work for el5
This commit is contained in:
Michael DeHaan 2014-03-16 12:32:28 -05:00
commit 0939a83174
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/packaging/rpm_key
View file

@ -138,7 +138,9 @@ class RpmKey:
def normalize_keyid(self, keyid):
"""Ensure a keyid doesn't have a leading 0x, has leading or trailing whitespace, and make sure is lowercase"""
ret = keyid.strip().lower()
if ret.startswith(('0x', '0X')):
if ret.startswith('0x'):
return ret[2:]
elif ret.startswith('0X'):
return ret[2:]
else:
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])
for line in stdout.splitlines():
line = line.strip()
if line.startswith('keyid:'):
if line.startswith(':signature packet:'):
# We want just the last 8 characters of the keyid
keyid = line.split(':')[1].strip()[8:]
keyid = line.split()[-1].strip()[8:]
return keyid
self.json_fail(msg="Unexpected gpg output")