diff options
Diffstat (limited to 'SCons/Tool')
| -rw-r--r-- | SCons/Tool/MSCommon/common.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/netframework.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/sdk.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/vc.py | 6 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/vs.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/intelc.py | 8 |
6 files changed, 10 insertions, 12 deletions
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py index 81004df..9d01835 100644 --- a/SCons/Tool/MSCommon/common.py +++ b/SCons/Tool/MSCommon/common.py @@ -163,7 +163,7 @@ def has_reg(value): try: SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, value) ret = True - except SCons.Util.WinError: + except OSError: ret = False return ret diff --git a/SCons/Tool/MSCommon/netframework.py b/SCons/Tool/MSCommon/netframework.py index b40576a..5e2c33a 100644 --- a/SCons/Tool/MSCommon/netframework.py +++ b/SCons/Tool/MSCommon/netframework.py @@ -41,7 +41,7 @@ def find_framework_root(): try: froot = read_reg(_FRAMEWORKDIR_HKEY_ROOT) debug("Found framework install root in registry: {}".format(froot)) - except SCons.Util.WinError as e: + except OSError: debug("Could not read reg key {}".format(_FRAMEWORKDIR_HKEY_ROOT)) return None diff --git a/SCons/Tool/MSCommon/sdk.py b/SCons/Tool/MSCommon/sdk.py index b76fbdd..439a7ad 100644 --- a/SCons/Tool/MSCommon/sdk.py +++ b/SCons/Tool/MSCommon/sdk.py @@ -78,7 +78,7 @@ class SDKDefinition: try: sdk_dir = read_reg(hkey) - except SCons.Util.WinError as e: + except OSError: debug('find_sdk_dir(): no SDK registry key {}'.format(repr(hkey))) return None diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py index 87a1064..66a081f 100644 --- a/SCons/Tool/MSCommon/vc.py +++ b/SCons/Tool/MSCommon/vc.py @@ -447,7 +447,7 @@ def find_vc_pdir(env, msvc_version): comps = find_vc_pdir_vswhere(msvc_version, env) if not comps: debug('no VC found for version {}'.format(repr(msvc_version))) - raise SCons.Util.WinError + raise OSError debug('VC found: {}'.format(repr(msvc_version))) return comps else: @@ -455,13 +455,13 @@ def find_vc_pdir(env, msvc_version): try: # ordinarily at win64, try Wow6432Node first. comps = common.read_reg(root + 'Wow6432Node\\' + key, hkroot) - except SCons.Util.WinError as e: + except OSError: # at Microsoft Visual Studio for Python 2.7, value is not in Wow6432Node pass if not comps: # not Win64, or Microsoft Visual Studio for Python 2.7 comps = common.read_reg(root + key, hkroot) - except SCons.Util.WinError as e: + except OSError: debug('no VC registry key {}'.format(repr(key))) else: debug('found VC in registry: {}'.format(comps)) diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py index cc8946f..7be7049 100644 --- a/SCons/Tool/MSCommon/vs.py +++ b/SCons/Tool/MSCommon/vs.py @@ -82,7 +82,7 @@ class VisualStudio: key = root + key try: comps = read_reg(key) - except SCons.Util.WinError as e: + except OSError: debug('no VS registry key {}'.format(repr(key))) else: debug('found VS in registry: {}'.format(comps)) diff --git a/SCons/Tool/intelc.py b/SCons/Tool/intelc.py index 0d07c72..ac6fa60 100644 --- a/SCons/Tool/intelc.py +++ b/SCons/Tool/intelc.py @@ -175,9 +175,7 @@ def get_intel_registry_value(valuename, version=None, abi=None): except SCons.Util.RegError: raise MissingRegistryError("%s was not found in the registry, for Intel compiler version %s, abi='%s'"%(K, version,abi)) - except SCons.Util.RegError: - raise MissingRegistryError("%s was not found in the registry, for Intel compiler version %s, abi='%s'"%(K, version,abi)) - except SCons.Util.WinError: + except (SCons.Util.RegError, OSError): raise MissingRegistryError("%s was not found in the registry, for Intel compiler version %s, abi='%s'"%(K, version,abi)) # Get the value: @@ -201,7 +199,7 @@ def get_all_compiler_versions(): try: k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, keyname) - except SCons.Util.WinError: + except OSError: # For version 13 or later, check for default instance UUID if is_win64: keyname = 'Software\\WoW6432Node\\Intel\\Suites' @@ -210,7 +208,7 @@ def get_all_compiler_versions(): try: k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, keyname) - except SCons.Util.WinError: + except OSError: return [] i = 0 versions = [] |