Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Parameters for the Surround SCM CLI command were not quoted #252

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Parameters for the Surround SCM CLI command were not quoted #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27fceb3
Fixed issue with unquoted parameters'
pvince Apr 27, 2017
ffb61a8
Removed changes to tab vs. spaces
pvince Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/core/sourcecontrol/Surround.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public Surround()
/// <remarks></remarks>
public override Modification[] GetModifications(IIntegrationResult from, IIntegrationResult to)
{
string command = string.Format(System.Globalization.CultureInfo.CurrentCulture,"cc {0} -d{1}:{2} {3} -b{4} -p{5} {6} -z{7} -y{8}",
string command = string.Format(System.Globalization.CultureInfo.CurrentCulture,"cc '{0}' -d{1}:{2} {3} -b'{4}' -p'{5}' {6} -z'{7}' -y'{8}'",
File,
from.StartTime.ToString(TO_SSCM_DATE_FORMAT, CultureInfo.CurrentCulture),
to.StartTime.ToString(TO_SSCM_DATE_FORMAT, CultureInfo.CurrentCulture),
Expand Down Expand Up @@ -196,7 +196,7 @@ public override void GetSource(IIntegrationResult result)
Log.Info("Getting source from Surround SCM");
result.BuildProgressInformation.SignalStartRunTask("Getting source from Surround SCM");

string command = string.Format(System.Globalization.CultureInfo.CurrentCulture,"get * -q -tcheckin -wreplace {0} -d{1} -b{2} -p{3} -z{4} -y{5}",
string command = string.Format(System.Globalization.CultureInfo.CurrentCulture,"get * -q -tcheckin -wreplace {0} -d'{1}' -b'{2}' -p'{3}' -z'{4}' -y'{5}'",
(Recursive == 0) ?string.Empty : "-r",
WorkingDirectory,
Branch,
Expand Down