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

added gpg2 as fallback fixes #1796

Browse source
This commit is contained in:
Brian Coca 2015-08-10 09:34:55 -04:00 committed by Matt Clay
parent 4856f78031
commit a8b24699be
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/packaging/os/rpm_key.py
View file

@ -141,7 +141,14 @@ class RpmKey:
return ret
def getkeyid(self, keyfile):
gpg = self.module.get_bin_path('gpg', True)
gpg = self.module.get_bin_path('gpg')
if not gpg:
gpg = self.module.get_bin_path('gpg2')
if not gpg:
self.json_fail(msg="rpm_key requires a command lne gpg or gpg2, none found")
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()