p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed setup.py overlaid-install warning. 

Before this change, if you had a global Django installation in /usr/local/, you
might get a spurious warning when installing Django within a virtualenv.

Thanks epicserve for the report and debugging help.
This commit is contained in:
Carl Meyer 2013-03-29 13:49:37 -06:00
parent 391ec5a085
commit 0524ad3fad
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@ -10,9 +10,12 @@ import sys
# still present in site-packages. See #18115. # still present in site-packages. See #18115.
overlay_warning = False overlay_warning = False
if "install" in sys.argv: if "install" in sys.argv:
# We have to try also with an explicit prefix of /usr/local in order to lib_paths = [get_python_lib()]
# catch Debian's custom user site-packages directory. if lib_paths[0].startswith("/usr/lib/"):
for lib_path in get_python_lib(), get_python_lib(prefix="/usr/local"): # We have to try also with an explicit prefix of /usr/local in order to
# catch Debian's custom user site-packages directory.
lib_paths.append(get_python_lib(prefix="/usr/local"))
for lib_path in lib_paths:
existing_path = os.path.abspath(os.path.join(lib_path, "django")) existing_path = os.path.abspath(os.path.join(lib_path, "django"))
if os.path.exists(existing_path): if os.path.exists(existing_path):
# We note the need for the warning here, but present it after the # We note the need for the warning here, but present it after the