From baa91ebc95a36636aca55f0de8055bcf17145090 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Thu, 11 Oct 2012 13:22:30 -0400 Subject: [PATCH] Add DIST_MODULE_PATH so setup.py and ansible.spec can live in harmony. Closes #1277 --- lib/ansible/constants.py | 6 +++++- setup.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index dffcc241051..782bd1254e1 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -60,12 +60,16 @@ p = load_config_file() active_user = pwd.getpwuid(os.geteuid())[0] +# Needed so the RPM can call setup.py and have modules land in the +# correct location. See #1277 for discussion +DIST_MODULE_PATH = '/usr/share/ansible/' + # sections in config file DEFAULTS='defaults' # configurable things DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts')) -DEFAULT_MODULE_PATH = shell_expand_path(get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', '/usr/share/ansible')) +DEFAULT_MODULE_PATH = shell_expand_path(get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', DIST_MODULE_PATH)) DEFAULT_REMOTE_TMP = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp')) DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command') DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, '*') diff --git a/setup.py b/setup.py index 8d768919fcf..06f357b8c9d 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,8 @@ from ansible import __version__, __author__ from distutils.core import setup # find library modules -from ansible.constants import DEFAULT_MODULE_PATH -data_files = [ (DEFAULT_MODULE_PATH, glob('./library/*')) ] +from ansible.constants import DIST_MODULE_PATH +data_files = [ (DIST_MODULE_PATH, glob('./library/*')) ] print "DATA FILES=%s" % data_files