MSVS documentation, remove unnecessary exceptions, and restor escape() to its previous implementation. (Greg Spencer)

1 files changed, 17 insertions, 9 deletions

diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py
index 93a36cc..fd2484a 100644
--- a/src/engine/SCons/Tool/mslib.py
+++ b/src/engine/SCons/Tool/mslib.py
@@ -42,23 +42,31 @@ def generate(env):
     env['BUILDERS']['Library'] = SCons.Defaults.StaticLibrary
     env['BUILDERS']['StaticLibrary'] = SCons.Defaults.StaticLibrary
 
-    version = SCons.Tool.msvs.get_default_visualstudio_version(env)
+    try:
+        version = SCons.Tool.msvs.get_default_visualstudio_version(env)
 
-    if env.has_key('MSVS_IGNORE_IDE_PATHS') and env['MSVS_IGNORE_IDE_PATHS']:
-        include_path, lib_path, exe_path = SCons.Tool.msvc.get_msvc_default_paths(version)
-    else:
-        include_path, lib_path, exe_path = SCons.Tool.msvc.get_msvc_paths(version)
+        if env.has_key('MSVS_IGNORE_IDE_PATHS') and env['MSVS_IGNORE_IDE_PATHS']:
+            include_path, lib_path, exe_path = SCons.Tool.msvc.get_msvc_default_paths(version)
+        else:
+            include_path, lib_path, exe_path = SCons.Tool.msvc.get_msvc_paths(version)
 
-    # since other tools can set this, we just make sure that the
-    # relevant stuff from MSVS is in there somewhere.
-    env.PrependENVPath('PATH', exe_path)
+        # since other tools can set this, we just make sure that the
+        # relevant stuff from MSVS is in there somewhere.
+        env.PrependENVPath('PATH', exe_path)
+    except (SCons.Util.RegError, SCons.Errors.InternalError):
+        pass
 
     env['AR']          = 'lib'
     env['ARFLAGS']     = '/nologo'
     env['ARCOM']       = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
 
 def exists(env):
-    if not SCons.Util.can_read_reg or not SCons.Tool.msvs.get_visualstudio_versions():
+    try:
+        v = SCons.Tool.msvs.get_visualstudio_versions()
+    except (SCons.Util.RegError, SCons.Errors.InternalError):
+        pass
+    
+    if not v:
         return env.Detect('lib')
     else:
         # there's at least one version of MSVS installed.