ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/XmlTools/xmlpatch.cpp

Comparing s10k/XmlTools/xmlpatch.cpp (file contents):
Revision 1073 by s10k, Thu Oct 5 17:48:32 2017 UTC vs.
Revision 1111 by s10k, Sat Feb 16 17:25:06 2019 UTC

#	Line 373 | Line 373 | void XmlPatch::checkAndProcessValidComma
373
374		command=GlobalVars::AppExecutable;
375
376	–	// Append files if forced to
377	–	if(!this->forceTargetFilesWildcard.isEmpty()){
378	–	command+=" --files '"+this->forceTargetFilesWildcard+"' ";
379	–	}
380	–
376		command+=" "+getPatchParameterValue(line,"Options");
377
378		// Add --no-backups and --no-verbose if patch was called with that arguments
#	Line 392 | Line 387 | void XmlPatch::checkAndProcessValidComma
387		command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
388		command.replace("\"\"","'"); // this allow to use '' as ' ('' is transformed in "" and then in ')
389
390	+	// Append files if forced to
391	+
392	+	// This is added at the end so the apostrophe isn't done here (the path can contain it)
393	+	if(!this->forceTargetFilesWildcard.isEmpty()){
394	+	command+=" --files \""+this->forceTargetFilesWildcard+"\" ";
395	+	}
396	+
397		executeCommandOperation(command);
398
399		command.clear();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)