From d9a377cbb1271fba9d547bd75971024b9756543a Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Thu, 1 Nov 2012 20:40:28 +0200 Subject: [PATCH 1/2] Fix installing to virtualenvs. --- lib/ansible/constants.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index a978c49668..6eac602db2 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -17,6 +17,7 @@ import os import pwd +import sys import ConfigParser def get_config(p, section, key, env_var, default): @@ -60,7 +61,7 @@ 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/' +DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') # sections in config file DEFAULTS='defaults' From 3616dffb68badb2b8d56ef34391d7aae8de79cd6 Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Fri, 2 Nov 2012 01:42:04 +0200 Subject: [PATCH 2/2] Detect whether we're running in a virtualenv. --- lib/ansible/constants.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 6eac602db2..6b42c1c427 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -61,7 +61,10 @@ 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 = os.path.join(sys.prefix, 'share/ansible/') +if getattr(sys, "real_prefix", None): + DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') +else: + DIST_MODULE_PATH = '/usr/share/ansible/' # sections in config file DEFAULTS='defaults'