[niedbalski] Force use of http for key imports

2014-05-02 10:50:38 +01:00 · 2014-05-02 10:50:38 +01:00 · b2a11ee5cf
commit b2a11ee5cf
parent 46e6e8de36 8725ace777
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -12,3 +12,7 @@ test:

 sync:
 	@charm-helper-sync -c charm-helpers.yaml
+
+publish:
+	bzr push lp:charms/swift-storage
+	bzr push lp:charms/trusty/swift-storage
--- a/hooks/charmhelpers/fetch/init.py
+++ b/hooks/charmhelpers/fetch/init.py
@ -184,7 +184,7 @@ def add_source(source, key=None):
            apt.write(PROPOSED_POCKET.format(release))
    if key:
        subprocess.check_call(['apt-key', 'adv', '--keyserver',
-                               'keyserver.ubuntu.com', '--recv',
+                               'hkp://keyserver.ubuntu.com:80', '--recv',
                               key])