Merge topic 'file-DOWNLOAD-existing-file-matched-message'

666b3c6f13 Help: Clarify file(DOWNLOAD) behavior for existing file with same hash
87a40b720a file(DOWNLOAD): Fix message for existing file with matching hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7599
This commit is contained in:
Craig Scott
2022-08-26 10:53:38 +00:00
committed by Kitware Robot
2 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -1914,7 +1914,7 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
std::string msg;
std::string actualHash = hash->HashFile(file);
if (actualHash == expectedHash) {
msg = cmStrCat("returning early; file already exists with expected ",
msg = cmStrCat("skipping download as file already exists with expected ",
hashMatchMSG, '"');
if (!statusVar.empty()) {
status.GetMakefile().AddDefinition(statusVar, cmStrCat(0, ";\"", msg));