Merge pull request #4456 from jcftang/devel

This oneliner change allows apt-key to inherit the http_proxy variable.
11 years ago · cef7aaad2e
parent d73a5da9e5 a4c8d3ee68
commit cef7aaad2e
1 changed files with 1 additions and 1 deletions
--- a/library/packaging/apt_repository
+++ b/library/packaging/apt_repository
@ -304,7 +304,7 @@ class UbuntuSourcesList(SourcesList):

            if self.add_ppa_signing_keys_callback is not None:
                info = self._get_ppa_info(ppa_owner, ppa_name)
-                command = ['apt-key', 'adv', '--recv-keys', '--keyserver', 'keyserver.ubuntu.com', info['signing_key_fingerprint']]
+                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))