Tolerate win line endings on module load 2.5 (#38919)

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

* 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

(cherry picked from commit ad94d03ba1)

* Added changelog fragment

* Added ignore rules to older sanity tests

* Removed test files due to old shebang not being possible without bigger change
pull/38935/head
Jordan Borean 7 years ago committed by GitHub
parent 4b55ecc825
commit 0fede2ba60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes
- win_exec_wrapper - support loading of Windows modules different different line endings than the core modules (https://github.com/ansible/ansible/pull/37291)

@ -826,7 +826,7 @@ def _find_module_utils(module_name, b_module_data, module_path, module_args, tas
become_required = True become_required = True
for m in set(module_names): 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") mu_path = ps_module_utils_loader.find_plugin(m, ".psm1")
if not mu_path: if not mu_path:
raise AnsibleError('Could not find imported module support code for \'%s\'.' % m) raise AnsibleError('Could not find imported module support code for \'%s\'.' % m)

Loading…
Cancel
Save