From 1d7573ce40d830aee200569cb1f6a533e2b26342 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Fri, 13 Jul 2018 15:54:00 +0200 Subject: [PATCH] Sync charm-helpers to ensure Rocky support Change-Id: If2eb0cd5f441df2a28f6d481cb889c4b38cee2dc --- charmhelpers/fetch/ubuntu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py index 736be713..19aa6baf 100644 --- a/charmhelpers/fetch/ubuntu.py +++ b/charmhelpers/fetch/ubuntu.py @@ -315,7 +315,7 @@ def import_key(key): cmd = ['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80', '--recv-keys', key] try: - subprocess.check_call(cmd) + _run_with_retries(cmd) except subprocess.CalledProcessError: error = "Error importing PGP key '{}'".format(key) log(error)