Fix an incorrect registry lookup in msvc.py.

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 553c05e03e894d61a66e80460708685bf424a189..6cc256290317e7e5ca8adbe13c82c4f67b8e3148 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -31,6 +31,11 @@ RELEASE 0.95 - XXX
   - Work around Cygwin Python's silly fiction that it's using a
     case-sensitive file system.
 
+  From Kerim Borchaev:
+
+  - Fix a typo in a msvc.py's registry lookup:  "VCComponents.dat", not
+    "VSComponents.dat".
+
   From Chris Burghart:
 
   - Fix the ability to save/restore a PackageOption to a file.

diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index fac178c1bceb7e11d43d596055dc8e069b99a5e0..ace9cfb54d2c100764e7743c227582c335f3cbc8 100644 (file)
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -65,7 +65,7 @@ def _parse_msvc7_overrides(version):
     except SCons.Util.RegError:
         raise SCons.Errors.InternalError, "The Local AppData directory was not found in the registry."
 
-    comps = comps + '\\Microsoft\\VisualStudio\\' + version + '\\VSComponents.dat'
+    comps = comps + '\\Microsoft\\VisualStudio\\' + version + '\\VCComponents.dat'
     dirs = {}
 
     if os.path.exists(comps):