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, next has been updated
via 30efb5cf51ee6e297ebd0855834520af10fc5b36 (commit)
via 9f49ac3df0f0324d72daa54e2c005c30f4d74414 (commit)
from 876936fbc30a3d06715c4c32b3db46d2de1fb63c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30efb5cf51ee6e297ebd0855834520af10fc5b36
commit 30efb5cf51ee6e297ebd0855834520af10fc5b36
Merge: 876936f 9f49ac3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 8 16:37:21 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 8 16:37:21 2014 -0400
Merge topic 'ExternalProject-download-loop' into next
9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f49ac3df0f0324d72daa54e2c005c30f4d74414
commit 9f49ac3df0f0324d72daa54e2c005c30f4d74414
Author: Alan W. Irwin <air...@users.sourceforge.net>
AuthorDate: Mon Sep 8 12:24:17 2014 -0700
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Sep 8 16:36:35 2014 -0400
ExternalProject: Avoid infinite loop on file download hash mismatch
When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject:
Reattempt download when verification fails, 2015-01-15), we forgot to
actually increment the loop counter. Add the increment line.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 17cb866..a1c7629 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -607,6 +607,7 @@ Retrying download.
file(REMOVE \"\${file}\")
execute_process(COMMAND \${CMAKE_COMMAND} -P \"${download_script}\")
endif()
+ math(EXPR attempt \"\${attempt} + 1\")
endwhile()
if(\${succeeded})
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
