internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate win line endings on windows module_util load (#37291)

Browse Source 
* tolerate windows line endings when loading windows module utils.  Helpful for old custom windows modules.

* add test modules to demonstrate win line ending module load behaviour.

* attempt to fix sanity check failures

* pep8 fix

* explict skip of test modules from shebang check (core modules must still have expected unix style line endings)

* switch to rstrip() following core team meeting feedback
This commit is contained in:
jhawkesworth
2018-04-05 22:13:31 +01:00
committed by Jordan Borean
parent 4e38036bbd
commit ad94d03ba1
6 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/executor/module_common.py
View File

@@ -826,7 +826,7 @@ def _find_module_utils(module_name, b_module_data, module_path, module_args, tas
become_required = True
for m in set(module_names):
m = to_text(m)
m = to_text(m).rstrip() # tolerate windows line endings
mu_path = ps_module_utils_loader.find_plugin(m, ".psm1")
if not mu_path:
raise AnsibleError('Could not find imported module support code for \'%s\'.' % m)