Skip to content

A
ansible
Commit 05f5b5b2 by Juha Litola
Options

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

parent 58618474
Showing with 7 additions and 7 deletions
library/apt_key
...@@ -105,7 +105,7 @@ def download_key(url): ...@@ -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,12 +163,12 @@ if 'ANSIBLE_TEST_APT_KEY' in environ: ...@@ -163,12 +163,12 @@ 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']
def main(): def main():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment