From ed5e4d8be2aef9912b8fb7f3af8d9a963318879f Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 2 Mar 2009 16:02:19 -0500 Subject: BUG: Gracefully handle broken version symlinks This teaches the helper commands 'cmake -E cmake_symlink_executable' and 'cmake -E cmake_symlink_library' to remove broken symlinks before creating a symlink and report an error when the symlink cannot be created. See issue #8654. --- Source/cmake.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 1df573e..9a81138 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1366,24 +1366,28 @@ int cmake::ExecuteCMakeCommand(std::vector& args) if(soName != realName) { std::string fname = cmSystemTools::GetFilenameName(realName); - if(cmSystemTools::FileExists(soName.c_str())) + if(cmSystemTools::FileExists(soName.c_str()) || + cmSystemTools::FileIsSymlink(soName.c_str())) { cmSystemTools::RemoveFile(soName.c_str()); } if(!cmSystemTools::CreateSymlink(fname.c_str(), soName.c_str())) { + cmSystemTools::ReportLastSystemError("cmake_symlink_library"); result = 1; } } if(name != soName) { std::string fname = cmSystemTools::GetFilenameName(soName); - if(cmSystemTools::FileExists(soName.c_str())) + if(cmSystemTools::FileExists(name.c_str()) || + cmSystemTools::FileIsSymlink(name.c_str())) { cmSystemTools::RemoveFile(name.c_str()); } if(!cmSystemTools::CreateSymlink(fname.c_str(), name.c_str())) { + cmSystemTools::ReportLastSystemError("cmake_symlink_library"); result = 1; } } @@ -1398,12 +1402,14 @@ int cmake::ExecuteCMakeCommand(std::vector& args) if(name != realName) { std::string fname = cmSystemTools::GetFilenameName(realName); - if(cmSystemTools::FileExists(realName.c_str())) + if(cmSystemTools::FileExists(name.c_str()) || + cmSystemTools::FileIsSymlink(name.c_str())) { cmSystemTools::RemoveFile(name.c_str()); } if(!cmSystemTools::CreateSymlink(fname.c_str(), name.c_str())) { + cmSystemTools::ReportLastSystemError("cmake_symlink_executable"); result = 1; } } -- cgit v0.12