diff options
| author | willthames <will@thames.id.au> | 2014-02-12 03:06:57 +0100 |
|---|---|---|
| committer | willthames <will@thames.id.au> | 2014-02-12 03:06:57 +0100 |
| commit | e2d04f7e9696c3f8f3606ac008dccca1299da966 (patch) | |
| tree | 940e8e5d35b1e70327c7dd700827fb8cb8107dd7 /hacking/env-setup | |
| parent | Merge pull request #5962 from sivel/rax-facts-docs-update (diff) | |
| download | ansible-e2d04f7e9696c3f8f3606ac008dccca1299da966.tar.xz ansible-e2d04f7e9696c3f8f3606ac008dccca1299da966.zip | |
Allow hacking/env-setup module path to use config file library path
hacking/env-setup now adds the configured library path in ANSIBLE_CONFIG
to the ANSIBLE_LIBRARY environment variable in addition to the previous
default of ANSIBLE_HOME/library.
This replaces #5950.
Diffstat (limited to 'hacking/env-setup')
| -rwxr-xr-x | hacking/env-setup | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hacking/env-setup b/hacking/env-setup index aedd078726..6e4de1af72 100755 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -21,7 +21,8 @@ PREFIX_MANPATH="$ANSIBLE_HOME/docs/man" [[ $PYTHONPATH != ${PREFIX_PYTHONPATH}* ]] && export PYTHONPATH=$PREFIX_PYTHONPATH:$PYTHONPATH [[ $PATH != ${PREFIX_PATH}* ]] && export PATH=$PREFIX_PATH:$PATH -export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library" +unset ANSIBLE_LIBRARY +export ANSIBLE_LIBRARY="$ANSIBLE_HOME/library:`python $HACKING_DIR/get_library.py`" [[ $MANPATH != ${PREFIX_MANPATH}* ]] && export MANPATH=$PREFIX_MANPATH:$MANPATH # Print out values unless -q is set |