[Cmake-commits] CMake branch, next, updated. v2.8.2-225-g09db2df

[David Cole]

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  09db2df2ad59f3e1b087f8b9a5d977496c3d60d2 (commit)
       via  46df0b44ac97859ab40dd0aa03ceca297a455587 (commit)
      from  aa048e7d08762b24aae44df9265c3de9417b0be4 (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=09db2df2ad59f3e1b087f8b9a5d977496c3d60d2
commit 09db2df2ad59f3e1b087f8b9a5d977496c3d60d2
Merge: aa048e7 46df0b4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jul 12 16:51:17 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 12 16:51:17 2010 -0400

    Merge branch 'ctest-file-checksum' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46df0b44ac97859ab40dd0aa03ceca297a455587
commit 46df0b44ac97859ab40dd0aa03ceca297a455587
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jul 12 16:48:38 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 12 16:48:38 2010 -0400

    Activate retry code on any curl submit failure.
    
    Previously, we were only going into the retry block
    for time out conditions. But a "could not connect"
    response, or really any sort of curl failure, is
    also a condition where we should retry the submit
    if the user has requested a retry.

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index bfe515d..1e18259 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -536,8 +536,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
           << std::endl);
         }
 
-      // If we time out or checksum fails, wait and retry
-      if(res == CURLE_OPERATION_TIMEDOUT || this->HasErrors)
+      // If curl failed for any reason, or checksum fails, wait and retry
+      //
+      if(res != CURLE_OK || this->HasErrors)
         {
         std::string retryDelay = this->GetOption("RetryDelay") == NULL ?
           "" : this->GetOption("RetryDelay");
@@ -552,7 +553,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
         for(int i = 0; i < count; i++)
           {
           cmCTestLog(this->CTest, HANDLER_OUTPUT,
-            "   Connection timed out, waiting " << delay << " seconds...\n");
+            "   Submit failed, waiting " << delay << " seconds...\n");
 
           double stop = cmSystemTools::GetTime() + delay;
           while(cmSystemTools::GetTime() < stop)
@@ -582,7 +583,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const cmStdString& localprefix,
             this->ParseResponse(chunk);
             }
 
-          if(res != CURLE_OPERATION_TIMEDOUT && !this->HasErrors)
+          if(res == CURLE_OK && !this->HasErrors)
             {
             break;
             }

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake