mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
No longer try to import __version__ from release.py. (#16817)
I'm not sure why that would be desirable -- we really want __version__ to come from the controller whereas importing will come from the client node. If it turns out there was a reason to do that, please be sure to use an exception handler that catches all exceptions instead of only catching ImportError: ``` try: from ansible.release import __version__, __author__ except: __version__ = [...] ``` Fixes #16523
This commit is contained in:
parent
9497a814a8
commit
7e54c9a468
1 changed files with 3 additions and 1 deletions
|
@ -596,7 +596,9 @@ def _find_snippet_imports(module_name, module_data, module_path, module_args, ta
|
|||
# Create the module zip data
|
||||
zipoutput = BytesIO()
|
||||
zf = zipfile.ZipFile(zipoutput, mode='w', compression=compression_method)
|
||||
zf.writestr('ansible/__init__.py', b'from pkgutil import extend_path\n__path__=extend_path(__path__,__name__)\ntry:\n from ansible.release import __version__,__author__\nexcept ImportError:\n __version__="' + to_bytes(__version__) + b'"\n __author__="' + to_bytes(__author__) + b'"\n')
|
||||
### Note: If we need to import from release.py first,
|
||||
### remember to catch all exceptions: https://github.com/ansible/ansible/issues/16523
|
||||
zf.writestr('ansible/__init__.py', b'from pkgutil import extend_path\n__path__=extend_path(__path__,__name__)\n__version__="' + to_bytes(__version__) + b'"\n__author__="' + to_bytes(__author__) + b'"\n')
|
||||
zf.writestr('ansible/module_utils/__init__.py', b'from pkgutil import extend_path\n__path__=extend_path(__path__,__name__)\n')
|
||||
|
||||
zf.writestr('ansible_module_%s.py' % module_name, module_data)
|
||||
|
|
Loading…
Reference in a new issue