[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2600-g276ce96
Bill Hoffman
bill.hoffman at kitware.com
Wed Mar 20 17:59:34 EDT 2013
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 276ce96bebf099c89ad15c6bf9974a28e4ee2f75 (commit)
via 98d52cfd1e6008cf03264aea86a14ae540d3ddb2 (commit)
via 2557e84d672cc50e30c8934e06de10c6080dc092 (commit)
from 7322d370a47cd0f0b85a333f68dfe54bc2e22558 (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=276ce96bebf099c89ad15c6bf9974a28e4ee2f75
commit 276ce96bebf099c89ad15c6bf9974a28e4ee2f75
Merge: 7322d37 98d52cf
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Mar 20 17:59:25 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 20 17:59:25 2013 -0400
Merge topic 'ep_retry_clone' into next
98d52cf Retry three times on a failed git clone.
2557e84 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98d52cfd1e6008cf03264aea86a14ae540d3ddb2
commit 98d52cfd1e6008cf03264aea86a14ae540d3ddb2
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Mar 20 17:54:49 2013 -0400
Commit: Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Mar 20 17:54:49 2013 -0400
Retry three times on a failed git clone.
Gitorious sometimes fails to clone repositories. This change has
external project try 3 times before giving up.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index bf2892b..95ec171 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -287,11 +287,20 @@ if(error_code)
message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
endif()
-execute_process(
- COMMAND \"${git_EXECUTABLE}\" clone \"${git_repository}\" \"${src_name}\"
- WORKING_DIRECTORY \"${work_dir}\"
- RESULT_VARIABLE error_code
- )
+# try the clone 3 times incase there is an odd git clone issue
+set(error_code 1)
+set(number_of_tries 0)
+while(error_code AND number_of_tries LESS 3)
+ execute_process(
+ COMMAND \"${git_EXECUTABLE}\" clone \"${git_repository}\" \"${src_name}\"
+ WORKING_DIRECTORY \"${work_dir}\"
+ RESULT_VARIABLE error_code
+ )
+endwhile()
+if(number_of_tries GREATER 1)
+ message(STATUS \"Had to git clone more than once:
+ \${number_of_tries} times.\")
+endif()
if(error_code)
message(FATAL_ERROR \"Failed to clone repository: '${git_repository}'\")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 19 ++++++++++++++-----
Source/CMakeVersion.cmake | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list