summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-01-16 04:22:51 (GMT)
committerSteven Knight <knight@baldmt.com>2004-01-16 04:22:51 (GMT)
commit377db9abd19ca27f58932ed778613281eb550a9d (patch)
treee8c02d16a014e5efe0164c0af7c1b9ed19472a07
parent49b12cb34884e0641d250db913953a5934e2aaa0 (diff)
downloadSCons-377db9abd19ca27f58932ed778613281eb550a9d.zip
SCons-377db9abd19ca27f58932ed778613281eb550a9d.tar.gz
SCons-377db9abd19ca27f58932ed778613281eb550a9d.tar.bz2
Fix an incorrect registry lookup in msvc.py.
-rw-r--r--src/CHANGES.txt5
-rw-r--r--src/engine/SCons/Tool/msvc.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 553c05e..6cc2562 100644
--- 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 fac178c..ace9cfb 100644
--- 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):