From 983b4c11d302fb87f34a204170b3aadc4f2d72cb Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Tue, 2 Dec 2003 13:45:59 +0000
Subject: MSVC fix for pre-2.3 Python versions.  (Charles Crain)

---
 src/CHANGES.txt               | 2 ++
 src/engine/SCons/Tool/msvc.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8e1054a..c9a4ad6 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -23,6 +23,8 @@ RELEASE 0.95 - XXX
   - Fix an incorrect _concat() call in the $RCINCFLAGS definition for
     the mingw Tool.
 
+  - Fix a problem with the msvc tool with Python versions prior to 2.3.
+
   From David M. Cooke:
 
   - Make the Fortran scanner case-insensitive for the INCLUDE string.
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index f7ec5e4..b9ce9bc 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -133,7 +133,7 @@ def _get_msvc7_path(path, version, platform):
     # do weird things with the $(xxx)'s
     s = re.compile('\$\(([a-zA-Z0-9_]+?)\)')
 
-    def repl(match):
+    def repl(match, paths=paths):
         key = string.upper(match.group(1))
         if paths.has_key(key):
             return paths[key]
-- 
cgit v0.12