diff options
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py index 0fba2c1b53..615b5ed6d1 100644 --- a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py +++ b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py @@ -177,15 +177,23 @@ class WindowsVsToolChain(IUefiBuildPlugin): def _get_vs_install_path(self, vs_version, varname):
# check if already specified
- path = shell_environment.GetEnvironment().get_shell_var(varname)
+ path = None
+ if varname is not None:
+ path = shell_environment.GetEnvironment().get_shell_var(varname)
+
if(path is None):
# Not specified...find latest
- (rc, path) = FindWithVsWhere(vs_version=vs_version)
- if rc == 0 and path is not None and os.path.exists(path):
+ try:
+ path = FindWithVsWhere(vs_version=vs_version)
+ except (EnvironmentError, ValueError, RuntimeError) as e:
+ self.Logger.error(str(e))
+ return None
+
+ if path is not None and os.path.exists(path):
self.Logger.debug("Found VS instance for %s", vs_version)
else:
self.Logger.error(
- "Failed to find VS instance with VsWhere (%d)" % rc)
+ f"VsWhere successfully executed, but could not find VS instance for {vs_version}.")
return path
def _get_vc_version(self, path, varname):
|