fix issue when repo/path contains spaces (#3985)

microsoft · Oct 10, 2022 · ca20a05 · ca20a05
1 parent 3092805
commit ca20a05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Agent.Plugins/TfsVCCliManager.cs b/src/Agent.Plugins/TfsVCCliManager.cs
@@ -296,9 +296,10 @@ await processInvoker.ExecuteAsync(
 
         private void CleanupTfsVCOutput(ref TfsVCPorcelainCommandResult command, string executedCommand)
         {
+            // tf.exe removes double quotes from the output, we also replace it in the input command to correctly find the extra output
             List<string> stringsToRemove = command
                 .Output
-                .Where(item => item.Contains(executedCommand))
+                .Where(item => item.Contains(executedCommand.Replace("\"", "")))
                 .ToList();
             command.Output.RemoveAll(item => stringsToRemove.Contains(item));
         }

diff --git a/src/Agent.Worker/Build/TfsVCCommandManager.cs b/src/Agent.Worker/Build/TfsVCCommandManager.cs
@@ -277,9 +277,10 @@ await processInvoker.ExecuteAsync(
 
         private void CleanupTfsVCOutput(ref TfsVCPorcelainCommandResult command, string executedCommand)
         {
+            // tf.exe removes double quotes from the output, we also replace it in the input command to correctly find the extra output
             List<string> stringsToRemove = command
                 .Output
-                .Where(item => item.Contains(executedCommand))
+                .Where(item => item.Contains(executedCommand.Replace("\"", "")))
                 .ToList();
             command.Output.RemoveAll(item => stringsToRemove.Contains(item));
         }