ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixed add_key stalling indefinitely, and test code leaking into production setting

Browse source
This commit is contained in:
Juha Litola 2013-01-25 13:29:39 +02:00
parent 58618474db
commit 05f5b5b279
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/apt_key
View file

@ -105,7 +105,7 @@ def download_key(url):
def add_key(key): def add_key(key):
return call("apt-key add -", shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) p = Popen("apt-key add -", shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
(_, _) = p.communicate(key) (_, _) = p.communicate(key)
return p.returncode == 0 return p.returncode == 0
@ -163,10 +163,10 @@ if 'ANSIBLE_TEST_APT_KEY' in environ:
return extra return extra
if environ.get('ANSIBLE_TEST_APT_KEY') == 'none': if environ.get('ANSIBLE_TEST_APT_KEY') == 'none':
def key_present(key_id): def key_present(key_id):
return False return False
else: else:
def key_present(key_id): def key_present(key_id):
return key_id == environ['ANSIBLE_TEST_APT_KEY'] return key_id == environ['ANSIBLE_TEST_APT_KEY']