diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-04-28 17:36:09 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-04-29 08:47:49 -0700 |
| commit | 487e6562ca30c6097e54766ca53fb775a939c2ae (patch) | |
| tree | 0436905dc7a1a1e5148615fbbe70fec033ae8e72 /lib/ansible/cli | |
| parent | 7af47a3886d5a2ebdc49f79564d84a336e10ffcb (diff) | |
| download | ansible-487e6562ca30c6097e54766ca53fb775a939c2ae.tar.gz | |
Fix ziploader for the cornercase of ansible invoking ansible.
* Make ziploader's ansible and ansible.module_utils libraries into
namespace packages.
* Move __version__ and __author__ from ansible/__init__ to
ansible/release.py. This is because namespace packages only load one
__init__.py. If that is not the __init__.py with the author and
version info then those won't be available.
* In ziplaoder, move the version ito ANSIBLE_CONSTANTS.
* Change PluginLoader to properly construct the path to the plugins even
when namespace packages are present.
Diffstat (limited to 'lib/ansible/cli')
| -rw-r--r-- | lib/ansible/cli/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index 5493d49b19..00c29524e7 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -30,7 +30,7 @@ import getpass import signal import subprocess -from ansible import __version__ +from ansible.release import __version__ from ansible import constants as C from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.utils.unicode import to_bytes, to_unicode |