diff options
author | Steven Knight <knight@baldmt.com> | 2003-10-12 14:01:45 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2003-10-12 14:01:45 (GMT) |
commit | cbb331ea63305207c070c77a7c7403d23b049f9d (patch) | |
tree | 42f39d0ea94afb5d72f310572e0ffd12e502c304 /src/script | |
parent | 57a6a5147897525742331568d9538371c7260cf8 (diff) | |
download | SCons-cbb331ea63305207c070c77a7c7403d23b049f9d.zip SCons-cbb331ea63305207c070c77a7c7403d23b049f9d.tar.gz SCons-cbb331ea63305207c070c77a7c7403d23b049f9d.tar.bz2 |
Python 1.5.2 portability in the previous script fix.
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/scons.py | 8 | ||||
-rw-r--r-- | 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 a90e1ba..11a24cb 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 520d0fa..cc9e58d 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, |