External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1493 from wwitzel3/devel

Browse Source 
fix open_fifo_write call
This commit is contained in:
Alan Rominger
2016-04-11 16:24:43 -04:00
parent 0a15ece049 12b1068ed4
commit 86d98e0999
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -394,7 +394,7 @@ class BaseTask(Task):
# will be read then closed, instead of leaving the SSH key on disk. # will be read then closed, instead of leaving the SSH key on disk.
if name in ('credential', 'network_credential', 'scm_credential', 'ad_hoc_credential') and not ssh_too_old: if name in ('credential', 'network_credential', 'scm_credential', 'ad_hoc_credential') and not ssh_too_old:
path = os.path.join(kwargs.get('private_data_dir', tempfile.gettempdir()), name) path = os.path.join(kwargs.get('private_data_dir', tempfile.gettempdir()), name)
self.open_fifo_write(path) self.open_fifo_write(path, data)
else: else:
handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None)) handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None))
f = os.fdopen(handle, 'w') f = os.fdopen(handle, 'w')
@@ -404,7 +404,7 @@ class BaseTask(Task):
private_data_files[name] = path private_data_files[name] = path
return private_data_files return private_data_files
def open_fifo_write(self, path): def open_fifo_write(self, path, data):
'''open_fifo_write opens the fifo named pipe in a new thread. '''open_fifo_write opens the fifo named pipe in a new thread.
This blocks until the the calls to ssh-agent/ssh-add have read the This blocks until the the calls to ssh-agent/ssh-add have read the
credential information from the pipe. credential information from the pipe.