This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 5c887742c5f9e91b4d96c79a64782cff3b631849 (commit)
via 98a78f34504707fdb7715ffd5338cf40c4ebf899 (commit)
via 2201ecec44adcc490c7481a52a88d6543bc5dd7b (commit)
via 11e2f53e3051a3da681a9ed9e4255c2d8fbc86fc (commit)
via 5c07d3900dfca4a1c7eb37cd00f448a8312dca03 (commit)
via fa5090b4418bc7ff0495cac02aac1a27e40163f7 (commit)
from fd93616b745218edbeaa2077da3fb78842b34a7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c887742c5f9e91b4d96c79a64782cff3b631849
commit 5c887742c5f9e91b4d96c79a64782cff3b631849
Merge: 11e2f53 98a78f3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 10:44:15 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 10 10:44:15 2017 -0500
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11e2f53e3051a3da681a9ed9e4255c2d8fbc86fc
commit 11e2f53e3051a3da681a9ed9e4255c2d8fbc86fc
Merge: fd93616 5c07d39
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 15:41:12 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 10 10:41:15 2017 -0500
Merge topic 'windows-mt-update-quiet'
5c07d390 cmcmd: Fix typo in RunCommand logic
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1473
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c07d3900dfca4a1c7eb37cd00f448a8312dca03
commit 5c07d3900dfca4a1c7eb37cd00f448a8312dca03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 10:35:24 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 10 10:37:26 2017 -0500
cmcmd: Fix typo in RunCommand logic
Fix logic added by commit 18eae3f04d (Windows: Do not report manifest
tool update notification as failure, 2017-11-09).
Issue: #17444
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 433caef..69339b4 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1594,7 +1594,7 @@ static bool RunCommand(const char* comment, std::vector<std::string>& command,
retCode == 0 || (retCodeOkay && retCodeOkay(retCode));
bool const success = commandResult && retCodeSuccess;
if (retCodeOut) {
- if (commandResult || !retCodeOkay) {
+ if (commandResult || !retCodeSuccess) {
*retCodeOut = retCode;
} else {
*retCodeOut = -1;
-----------------------------------------------------------------------
Summary of changes:
Source/cmcmd.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake