From f9b4c78a8981df2b8aa81b0a2d32bc8e828c9ca3 Mon Sep 17 00:00:00 2001 From: Jason Edmeades Date: Wed, 5 Sep 2012 23:41:48 +0100 Subject: [PATCH] cmd: A successful set should reset the errorlevel. --- programs/cmd/builtins.c | 1 + programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b2f9aeb57a..a9e74736d7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2366,6 +2366,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if ((!status)) WCMD_print_error(); + else errorlevel = 0; } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fe4c30caab..6a19d2c578 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -201,13 +201,13 @@ baz@space@ @todo_wine@0 ------------ Testing 'set' ------------ 1 -@todo_wine@0 +0 FOOBAR not defined @todo_wine@ baz FOOBAR = baz -@todo_wine@0 +0 @todo_wine@ baz2 -@todo_wine@0 +0 bar @todo_wine@FOOBAR= bar @todo_wine@FOOBAR = baz2 -- 2.32.0.93.g670b81a890