[Cmake-commits] CMake branch, next, updated. v2.8.5-1924-ge6636f4

Brad King brad.king at kitware.com
Mon Sep 19 17:41:19 EDT 2011


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  e6636f4a232a30837ea242942b4eae0bf9b3b7d7 (commit)
       via  3c61e41deb9d4893e6c32296fe0892be64284ea0 (commit)
      from  2f4df3a7917a16740613e4310a7d41c81a3fbd37 (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=e6636f4a232a30837ea242942b4eae0bf9b3b7d7
commit e6636f4a232a30837ea242942b4eae0bf9b3b7d7
Merge: 2f4df3a 3c61e41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 19 17:41:18 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 19 17:41:18 2011 -0400

    Merge topic 'file-download-http-error' into next
    
    3c61e41 Check return code from setting curl option in file(DOWNLOAD)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c61e41deb9d4893e6c32296fe0892be64284ea0
commit 3c61e41deb9d4893e6c32296fe0892be64284ea0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 19 17:38:51 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 19 17:38:51 2011 -0400

    Check return code from setting curl option in file(DOWNLOAD)

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 15ebc60..f933666 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2755,6 +2755,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
 
   // enable HTTP ERROR parsing
   res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+  check_curl_result(res, "DOWNLOAD cannot set http failure option: ");
 
   res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
                            cmWriteToFileCallback);

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

Summary of changes:
 Source/cmFileCommand.cxx |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list