From 17143c4837393d42c484b42d1789b85b2cff1aaf Mon Sep 17 00:00:00 2001
From: Rebecca Cran <rebecca@bsdio.com>
Date: Sun, 13 Jun 2021 11:43:01 +0800
Subject: BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools
 check

When using the in-source BaseTools, edksetup.bat will exit with an
ERRORLEVEL of 1 because the line in toolsetup.bat
"%PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL"
fails.

Ensure ERRORLEVEL is set to 0 when edksetup.bat or toolsetup.bat is
successfully run.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
---
 BaseTools/toolsetup.bat | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'BaseTools/toolsetup.bat')

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 4fcff31879..58fd26a4b5 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -401,6 +401,8 @@ goto end
   if %ERRORLEVEL% EQU 0 (
     goto use_pip_basetools
   ) else (
+    REM reset ERRORLEVEL
+    type nul>nul
     goto use_builtin_basetools
   )
 
-- 
cgit v1.2.3