From cc53a1079bbaca41acbaa252d1c8e208615b0daf Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sun, 12 Oct 2003 14:01:45 +0000 Subject: [PATCH] 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 --- src/script/scons.py | 8 +++++--- src/script/sconsign.py | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/script/scons.py b/src/script/scons.py index a90e1bab..11a24cb1 100644 --- 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 520d0fa3..cc9e58da 100644 --- 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, -- 2.26.2