openstack/charm-glance
Code Issues Proposed changes

Sync charm-helpers to ensure Rocky support

Browse Source 
Change-Id: If2eb0cd5f441df2a28f6d481cb889c4b38cee2dc
This commit is contained in:
Chris MacNaughton
2018-07-13 15:54:00 +02:00
parent 4db3942f0c
commit 1d7573ce40
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charmhelpers/fetch/ubuntu.py
View File

@@ -315,7 +315,7 @@ def import_key(key):
cmd = ['apt-key', 'adv', '--keyserver', cmd = ['apt-key', 'adv', '--keyserver',
'hkp://keyserver.ubuntu.com:80', '--recv-keys', key] 'hkp://keyserver.ubuntu.com:80', '--recv-keys', key]
try: try:
subprocess.check_call(cmd) _run_with_retries(cmd)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
error = "Error importing PGP key '{}'".format(key) error = "Error importing PGP key '{}'".format(key)
log(error) log(error)