[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2129-g1927983

[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  1927983178fbc24340be164273710a0f6619b94f (commit)
       via  f123367254c4737981af3e0641e5a4f388d0567d (commit)
       via  132450066945d2c7244205df662f3137edfad5bc (commit)
      from  51ed80b6824bc6c0c50b75e71b716ff1783a4645 (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=1927983178fbc24340be164273710a0f6619b94f
commit 1927983178fbc24340be164273710a0f6619b94f
Merge: 51ed80b f123367
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 13 10:02:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 13 10:02:44 2013 -0500

    Merge topic 'file-REMOVE_RECURSE-symlink' into next
    
    f123367 file: Do not remove symlinked directories recursively (#10538)
    1324500 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f123367254c4737981af3e0641e5a4f388d0567d
commit f123367254c4737981af3e0641e5a4f388d0567d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 13 10:00:50 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 13 10:00:50 2013 -0500

    file: Do not remove symlinked directories recursively (#10538)
    
    If a symlink points at a directory the symlink should be removed but not
    the content of the directory.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 0cdbb82..018ce7e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2409,7 +2409,8 @@ bool cmFileCommand::HandleRemove(std::vector<std::string> const& args,
       fileName += "/" + *i;
       }
 
-    if(cmSystemTools::FileIsDirectory(fileName.c_str()) && recurse)
+    if(cmSystemTools::FileIsDirectory(fileName.c_str()) &&
+       !cmSystemTools::FileIsSymlink(fileName.c_str()) && recurse)
       {
       cmSystemTools::RemoveADirectory(fileName.c_str());
       }

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmFileCommand.cxx  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake