Issue 2005: Avoid an infinite loop looking for the Python library

directory.  Look for a "scons-local" directory in addition to a
"scons-local-{version}" directory.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3386 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f3a7115d31f7bd33657b379158ba1957f8330140..53d2b2449e9936bb722797c2f0f511a1c5807670 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -19,6 +19,13 @@ RELEASE 1.X - XXX
     - Fix the ability of the add_src_builder() method to add a new
       source builder to any other builder.
 
+    - Avoid an infinite loop on non-Windows systems trying to find the
+      SCons library directory if the Python library directory does not
+      begin with the string "python".
+
+    - Search for the SCons library directory in "scons-local" (with
+      no version number) after "scons-local-{VERSION}".
+
   From Gary Oberbrunner:
 
     - Make Glob() sort the returned list of Files or Nodes

diff --git a/src/script/scons.py b/src/script/scons.py
index db01549365027cbeaeef9e6efba718ad3f99aac3..d8ad7b24c3248a6f99ba8ff08e45d0ec314616c3 100644 (file)
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -66,9 +66,12 @@ libs = []
 if os.environ.has_key("SCONS_LIB_DIR"):
     libs.append(os.environ["SCONS_LIB_DIR"])
 
-local = 'scons-local-' + __version__
+local_version = 'scons-local-' + __version__
+local = 'scons-local'
 if script_dir:
+    local_version = os.path.join(script_dir, local_version)
     local = os.path.join(script_dir, local)
+libs.append(os.path.abspath(local_version))
 libs.append(os.path.abspath(local))
 
 scons_version = 'scons-%s' % __version__
@@ -137,14 +140,12 @@ else:
     except AttributeError:
         pass
     else:
-        while libpath:
-            libpath, tail = os.path.split(libpath)
-            if tail[:6] == "python":
-                break
-        if libpath:
-            # Python library is in /usr/libfoo/python*;
-            # check /usr/libfoo/scons*.
-            prefs.append(libpath)
+        # Split /usr/libfoo/python*/os.py to /usr/libfoo/python*.
+        libpath, tail = os.path.split(libpath)
+        # Split /usr/libfoo/python* to /usr/libfoo
+        libpath, tail = os.path.split(libpath)
+        # Check /usr/libfoo/scons*.
+        prefs.append(libpath)
 
 # Look first for 'scons-__version__' in all of our preference libs,
 # then for 'scons'.

diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 7591069644cf343d23c2f68df5e122a547e2dc15..b9629a823e9fb16087d23d46611f778b2f996c1c 100644 (file)
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -67,9 +67,12 @@ libs = []
 if os.environ.has_key("SCONS_LIB_DIR"):
     libs.append(os.environ["SCONS_LIB_DIR"])
 
-local = 'scons-local-' + __version__
+local_version = 'scons-local-' + __version__
+local = 'scons-local'
 if script_dir:
+    local_version = os.path.join(script_dir, local_version)
     local = os.path.join(script_dir, local)
+libs.append(os.path.abspath(local_version))
 libs.append(os.path.abspath(local))
 
 scons_version = 'scons-%s' % __version__
@@ -138,14 +141,12 @@ else:
     except AttributeError:
         pass
     else:
-        while libpath:
-            libpath, tail = os.path.split(libpath)
-            if tail[:6] == "python":
-                break
-        if libpath:
-            # Python library is in /usr/libfoo/python*;
-            # check /usr/libfoo/scons*.
-            prefs.append(libpath)
+        # Split /usr/libfoo/python*/os.py to /usr/libfoo/python*.
+        libpath, tail = os.path.split(libpath)
+        # Split /usr/libfoo/python* to /usr/libfoo
+        libpath, tail = os.path.split(libpath)
+        # Check /usr/libfoo/scons*.
+        prefs.append(libpath)
 
 # Look first for 'scons-__version__' in all of our preference libs,
 # then for 'scons'.