Log when exit code is not ignored.

dotnet · Dec 11, 2020 · 7f8cd68 · 7f8cd68
1 parent 8a2b95b
commit 7f8cd68
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Tasks/Exec.cs b/src/Tasks/Exec.cs
@@ -336,23 +336,23 @@ protected override bool HandleTaskExecutionErrors()
         {
             if (IgnoreExitCode)
             {
+                // Don't log when EchoOff and IgnoreExitCode.
                 if (!EchoOff)
                 {
                     Log.LogMessageFromResources(MessageImportance.Normal, "Exec.CommandFailedNoErrorCode", Command, ExitCode);
                 }
                 return true;
             }
 
-            if (!EchoOff)
+            // Don't emit expanded command when EchoOff is set.
+            string commandForLogging = EchoOff ? nameof(EchoOff) : Command;
+            if (ExitCode == NativeMethods.SE_ERR_ACCESSDENIED)
             {
-                if (ExitCode == NativeMethods.SE_ERR_ACCESSDENIED)
-                {
-                    Log.LogErrorWithCodeFromResources("Exec.CommandFailedAccessDenied", Command, ExitCode);
-                }
-                else
-                {
-                    Log.LogErrorWithCodeFromResources("Exec.CommandFailed", Command, ExitCode);
-                }
+                Log.LogErrorWithCodeFromResources("Exec.CommandFailedAccessDenied", commandForLogging, ExitCode);
+            }
+            else
+            {
+                Log.LogErrorWithCodeFromResources("Exec.CommandFailed", commandForLogging, ExitCode);
             }
             return false;
         }