Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #461: Ansible 2.3-compatible _get_candidate_temp_dirs().

This commit is contained in:
David Wilson 2019-01-20 10:50:38 +00:00
parent 9401c34f64
commit 3f31b166f6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ansible_mitogen/services.py
View File

@ -79,14 +79,17 @@ else:
def _get_candidate_temp_dirs(): def _get_candidate_temp_dirs():
options = ansible.constants.config.get_plugin_options('shell', 'sh') try:
# >=2.5
options = ansible.constants.config.get_plugin_options('shell', 'sh')
remote_tmp = options.get('remote_tmp') or ansible.constants.DEFAULT_REMOTE_TMP
system_tmpdirs = options.get('system_tmpdirs', ('/var/tmp', '/tmp'))
except AttributeError:
# 2.3
remote_tmp = ansible.constants.DEFAULT_REMOTE_TMP
system_tmpdirs = ('/var/tmp', '/tmp')
# Pre 2.5 this came from ansible.constants. return mitogen.utils.cast([remote_tmp] + list(system_tmpdirs))
remote_tmp = (options.get('remote_tmp') or
ansible.constants.DEFAULT_REMOTE_TMP)
dirs = list(options.get('system_tmpdirs', ('/var/tmp', '/tmp')))
dirs.insert(0, remote_tmp)
return mitogen.utils.cast(dirs)
def key_from_dict(**kwargs): def key_from_dict(**kwargs):