[Cmake-commits] CMake branch, next, updated. v2.8.3-1601-g1e305de

[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  1e305de012b9c92f9121c4a875254474a443f648 (commit)
       via  667cf5b96368205544fb82ccce81358957987720 (commit)
      from  754520b2b5d2cb6c9e74c266d82fa6189702b7b3 (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=1e305de012b9c92f9121c4a875254474a443f648
commit 1e305de012b9c92f9121c4a875254474a443f648
Merge: 754520b 667cf5b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 13:31:12 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 9 13:31:12 2011 -0500

    Merge topic 'fix-11761-less-file-download-noise' into next
    
    667cf5b Make file DOWNLOAD less noisy (#11761)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=667cf5b96368205544fb82ccce81358957987720
commit 667cf5b96368205544fb82ccce81358957987720
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 13:22:32 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Feb 9 13:22:32 2011 -0500

    Make file DOWNLOAD less noisy (#11761)
    
    Thanks to Daniel Nelson for the suggestion and the patch.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 8ebd41f..37fced2 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2658,10 +2658,6 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string>
 
     if (expectedMD5sum == actualMD5sum)
       {
-      this->Makefile->DisplayStatus(
-        "FILE(DOWNLOAD) returning early: file already exists with "
-        "expected MD5 sum", -1);
-
       if(statusVar.size())
         {
         cmOStringStream result;
diff --git a/Tests/CMakeTests/FileDownloadTest.cmake.in b/Tests/CMakeTests/FileDownloadTest.cmake.in
index 578f510..9dc2ebb 100644
--- a/Tests/CMakeTests/FileDownloadTest.cmake.in
+++ b/Tests/CMakeTests/FileDownloadTest.cmake.in
@@ -37,5 +37,7 @@ file(DOWNLOAD
   ${url}
   ${dir}/file3.png
   TIMEOUT 2
+  STATUS status
   EXPECTED_MD5 d16778650db435bda3a8c3435c3ff5d1
   )
+message(STATUS "${status}")

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

Summary of changes:
 Source/cmFileCommand.cxx                   |    4 ----
 Tests/CMakeTests/FileDownloadTest.cmake.in |    2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake