mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
bugfix: support path separators in module path
As described by http://docs.ansible.com/intro_configuration.html#library the library supports multiple paths to load modules from. Currently `setup.py` treats something like `/usr/share/ansible:/my/custom/modules` as a single directory name and results in the installed modules not being on the module path. (instead they are in a directory named `/usr/share/ansible:/my/custom/modules`) This commit simply takes the first listed directory as the install directory for the core modules.
This commit is contained in:
parent
332d3d6a0e
commit
4310fc260b
1 changed files with 2 additions and 1 deletions
3
setup.py
3
setup.py
|
@ -10,10 +10,11 @@ from distutils.core import setup
|
||||||
|
|
||||||
# find library modules
|
# find library modules
|
||||||
from ansible.constants import DEFAULT_MODULE_PATH
|
from ansible.constants import DEFAULT_MODULE_PATH
|
||||||
|
install_path = DEFAULT_MODULE_PATH.split(os.pathsep)[0]
|
||||||
dirs=os.listdir("./library/")
|
dirs=os.listdir("./library/")
|
||||||
data_files = []
|
data_files = []
|
||||||
for i in dirs:
|
for i in dirs:
|
||||||
data_files.append((os.path.join(DEFAULT_MODULE_PATH, i), glob('./library/' + i + '/*')))
|
data_files.append((os.path.join(install_path, i), glob('./library/' + i + '/*')))
|
||||||
|
|
||||||
setup(name='ansible',
|
setup(name='ansible',
|
||||||
version=__version__,
|
version=__version__,
|
||||||
|
|
Loading…
Reference in a new issue