From c6fafdeceefaa82f5960acf462d916370e52bc75 Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Tue, 18 Oct 2016 20:06:42 -0700 Subject: Changed cassandra charm to lp:~charmers/charms/trusty/cassandra/trunk Change-Id: I951bb23040ae50d371a8754628cf2e624889fdd3 Signed-off-by: Stuart Mackie --- charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'charms/trusty/cassandra/hooks/charmhelpers/fetch') diff --git a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py index 017a696..db0d86a 100644 --- a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py +++ b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py @@ -314,10 +314,6 @@ def add_source(source, key=None): key_file.flush() key_file.seek(0) subprocess.check_call(['apt-key', 'add', '-'], stdin=key_file) - elif 'http://' in key: - with NamedTemporaryFile('w+') as key_file: - subprocess.check_call(['wget', key, '-O-'], stdout=key_file) - subprocess.check_call(['apt-key', 'add', key_file.name]) else: # Note that hkp: is in no way a secure protocol. Using a # GPG key id is pointless from a security POV unless you -- cgit 1.2.3-korg