BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools check

[edk2-devel] [PATCH] BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools check

Posted by Rebecca Cran 2 years, 10 months ago

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>
---
 BaseTools/toolsetup.bat | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index a766a69f08..ca8bfdd677 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
   )
 
-- 
2.32.0




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76442): https://edk2.groups.io/g/devel/message/76442
Mute This Topic: https://groups.io/mt/83503069/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools check

Posted by Bob Feng 2 years, 10 months ago

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
Sent: Sunday, June 13, 2021 11:43 AM
To: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>; devel@edk2.groups.io
Subject: [edk2-devel] [PATCH] 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>
---
 BaseTools/toolsetup.bat | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index a766a69f08..ca8bfdd677 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   ) -- 
2.32.0




-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76442): https://edk2.groups.io/g/devel/message/76442
Mute This Topic: https://groups.io/mt/83503069/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@intel.com] -=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77075): https://edk2.groups.io/g/devel/message/77075
Mute This Topic: https://groups.io/mt/83503069/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [edk2-devel] [PATCH] BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools check

Posted by gaoliming 2 years, 10 months ago

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Rebecca Cran
> 发送时间: 2021年6月13日 11:43
> 收件人: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
> 抄送: Rebecca Cran <rebecca@bsdio.com>; devel@edk2.groups.io
> 主题: [edk2-devel] [PATCH] 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>
> ---
>  BaseTools/toolsetup.bat | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
> index a766a69f08..ca8bfdd677 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
> 
>    )
> 
> 
> 
> --
> 2.32.0
> 
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#76442): https://edk2.groups.io/g/devel/message/76442
> Mute This Topic: https://groups.io/mt/83503069/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76634): https://edk2.groups.io/g/devel/message/76634
Mute This Topic: https://groups.io/mt/83595694/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-