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

Merge pull request #8544 from Tenzer/faster-apt_repository

Browse source 
apt_repository: Check if key already exists before adding it
This commit is contained in:
Michael DeHaan 2014-08-11 08:09:19 -04:00
commit 82564df61a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/packaging/apt_repository
View file

@ -343,14 +343,19 @@ class UbuntuSourcesList(SourcesList):
line = 'deb http://ppa.launchpad.net/%s/%s/ubuntu %s main' % (ppa_owner, ppa_name, distro.codename) line = 'deb http://ppa.launchpad.net/%s/%s/ubuntu %s main' % (ppa_owner, ppa_name, distro.codename)
return line, ppa_owner, ppa_name return line, ppa_owner, ppa_name
def _key_already_exists(self, key_fingerprint):
rc, out, err = self.module.run_command('apt-key export %s' % key_fingerprint, check_rc=True)
return len(err) == 0
def add_source(self, line, comment='', file=None): def add_source(self, line, comment='', file=None):
if line.startswith('ppa:'): if line.startswith('ppa:'):
source, ppa_owner, ppa_name = self._expand_ppa(line) source, ppa_owner, ppa_name = self._expand_ppa(line)
if self.add_ppa_signing_keys_callback is not None: if self.add_ppa_signing_keys_callback is not None:
info = self._get_ppa_info(ppa_owner, ppa_name) info = self._get_ppa_info(ppa_owner, ppa_name)
command = ['apt-key', 'adv', '--recv-keys', '--keyserver', 'hkp://keyserver.ubuntu.com:80', info['signing_key_fingerprint']] if not self._key_already_exists(info['signing_key_fingerprint']):
self.add_ppa_signing_keys_callback(command) command = ['apt-key', 'adv', '--recv-keys', '--keyserver', 'hkp://keyserver.ubuntu.com:80', info['signing_key_fingerprint']]
self.add_ppa_signing_keys_callback(command)
file = file or self._suggest_filename('%s_%s' % (line, distro.codename)) file = file or self._suggest_filename('%s_%s' % (line, distro.codename))
else: else: