Python 1.5.2 portability in the previous script fix.

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

diff --git a/src/script/scons.py b/src/script/scons.py
index a90e1bab2ae34b6ab6b02c15382efae24e4d3b81..11a24cb1d0fe7b8a5afbe0246b764505da694d14 100644 (file)
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -122,9 +122,11 @@ else:
         prefs.append(sys.prefix)
 
     temp = map(lambda x: os.path.join(x, 'lib'), prefs)
-    temp.extend(map(lambda x: os.path.join(x, 'lib', 'python%d.%d' % (sys.version_info[0],
-                                                                      sys.version_info[1]),
-                                           'site-packages'), prefs))
+    temp.extend(map(lambda x: os.path.join(x,
+                                           'lib',
+                                           'python' + sys.version[:3],
+                                           'site-packages'),
+                           prefs))
     prefs = temp
 
 # Look first for 'scons-__version__' in all of our preference libs,

diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 520d0fa310cb8c9662febba2fcbab2bcbfbf23ef..cc9e58dac13db286ce106a35890ddc4f7f8f6119 100644 (file)
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -123,9 +123,11 @@ else:
         prefs.append(sys.prefix)
 
     temp = map(lambda x: os.path.join(x, 'lib'), prefs)
-    temp.extend(map(lambda x: os.path.join(x, 'lib', 'python%d.%d' % (sys.version_info[0],
-                                                                      sys.version_info[1]),
-                                           'site-packages'), prefs))
+    temp.extend(map(lambda x: os.path.join(x,
+                                           'lib',
+                                           'python' + sys.version[:3],
+                                           'site-packages'),
+                           prefs))
     prefs = temp
 
 # Look first for 'scons-__version__' in all of our preference libs,