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

allow apt-key module to work with binary key

Browse source
This commit is contained in:
Andrew Straw 2013-06-09 20:03:28 +00:00
parent edb6a683f3
commit 94e66ef558
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_common.py
View file

@ -859,7 +859,7 @@ class AnsibleModule(object):
self.cleanup(tmp_dest) self.cleanup(tmp_dest)
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e)) self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
def run_command(self, args, check_rc=False, close_fds=False, executable=None, data=None): def run_command(self, args, check_rc=False, close_fds=False, executable=None, data=None, binary_data=False):
''' '''
Execute a command, returns rc, stdout, and stderr. Execute a command, returns rc, stdout, and stderr.
args is the command to run args is the command to run
@ -895,7 +895,8 @@ class AnsibleModule(object):
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
if data: if data:
cmd.stdin.write(data) cmd.stdin.write(data)
cmd.stdin.write('\\n') if not binary_data:
cmd.stdin.write('\\n')
out, err = cmd.communicate() out, err = cmd.communicate()
rc = cmd.returncode rc = cmd.returncode
except (OSError, IOError), e: except (OSError, IOError), e:

2
library/packaging/apt_key
View file

@ -112,7 +112,7 @@ def download_key(module, url):
def add_key(module, key): def add_key(module, key):
cmd = "apt-key add -" cmd = "apt-key add -"
(rc, out, err) = module.run_command(cmd, data=key, check_rc=True) (rc, out, err) = module.run_command(cmd, data=key, check_rc=True, binary_data=True)
return True return True
def remove_key(module, key_id): def remove_key(module, key_id):