[Cmake-commits] CMake branch, next, updated. v3.5.2-1489-g7b6f897

[Brad King]

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  7b6f89791a8ba71d242669ed2496264cbbf2776a (commit)
       via  0ff7efacd558718f84eac5759560f9e0075fe473 (commit)
      from  a01cbf97476c413247a826e7f5ff906561822811 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b6f89791a8ba71d242669ed2496264cbbf2776a
commit 7b6f89791a8ba71d242669ed2496264cbbf2776a
Merge: a01cbf9 0ff7efa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 10:48:26 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 19 10:48:26 2016 -0400

    Merge topic 'cpack-dmg-attach-wait' into next
    
    0ff7efac Revert "CPack/DragNDrop: Wait for temporary volume to appear before using it"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ff7efacd558718f84eac5759560f9e0075fe473
commit 0ff7efacd558718f84eac5759560f9e0075fe473
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 10:47:58 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 19 10:47:58 2016 -0400

    Revert "CPack/DragNDrop: Wait for temporary volume to appear before using it"
    
    This reverts commit af3d76b3eb2981178260916d919b0b07ee8e4d55.
    It does not seem to make a difference.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index fb3c71c..9576eff 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -449,23 +449,10 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     mountpoint_regex.find(attach_output.c_str());
     std::string const temp_mount = mountpoint_regex.match(1);
 
-    // Wait for the volume to actually appear.
-    int wait_tries = 5;
-    while (!cmSystemTools::FileIsDirectory(temp_mount) && --wait_tries) {
-      cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Waiting for volume to appear: "
-                      << temp_mount << std::endl);
-      cmSystemTools::Delay(1000);
-    }
-    if (wait_tries == 0) {
-      cmCPackLogger(cmCPackLog::LOG_ERROR, "Temporary volume did not appear: "
-                      << temp_mount << std::endl);
-      had_error = true;
-    }
-
     // Remove dummy padding file so we have enough space on RW image ...
     std::ostringstream dummy_padding;
     dummy_padding << temp_mount << "/.dummy-padding-file";
-    if (!had_error && !cmSystemTools::RemoveFile(dummy_padding.str())) {
+    if (!cmSystemTools::RemoveFile(dummy_padding.str())) {
       cmCPackLogger(cmCPackLog::LOG_ERROR, "Error removing dummy padding file."
                       << std::endl);
 

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)


hooks/post-receive
-- 
CMake