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 12e18cda168d748750724947278190963142610e (commit) via 53fcb0bc665038d947316bbf01fff38f5fd98fb3 (commit) from 699094b3ceb919095860626784e1f9fc9e1397e2 (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=12e18cda168d748750724947278190963142610e commit 12e18cda168d748750724947278190963142610e Merge: 699094b 53fcb0b Author: Eric Noulard <eric.noul...@gmail.com> AuthorDate: Wed Jan 11 16:41:44 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jan 11 16:41:44 2012 -0500 Merge topic 'fixSymlinkInZIP' into next 53fcb0b Fix wrong test for symlink. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53fcb0bc665038d947316bbf01fff38f5fd98fb3 commit 53fcb0bc665038d947316bbf01fff38f5fd98fb3 Author: Eric NOULARD <eric.noul...@gmail.com> AuthorDate: Wed Jan 11 22:37:13 2012 +0100 Commit: Eric NOULARD <eric.noul...@gmail.com> CommitDate: Wed Jan 11 22:37:13 2012 +0100 Fix wrong test for symlink. It seems like: archive_entry_filetype(e) & AE_IFLNK is not the appropriate test for testing whether if an entryis refering to a symlink. archive_entry_symlink(e) is the good one. With this test we can skip data for both ZIP and TAR. diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index e8fc45a..dc6b749 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -247,8 +247,8 @@ bool cmArchiveWrite::AddFile(const char* file, return false; } - // do not copy content of symlink for ZIP format - if ((archive_format(this->Archive)!=ARCHIVE_FORMAT_ZIP) || (!(archive_entry_filetype(e) & AE_IFLNK))) + // do not copy content of symlink + if (!archive_entry_symlink(e)) { // Content. if(size_t size = static_cast<size_t>(archive_entry_size(e))) ----------------------------------------------------------------------- Summary of changes: Source/cmArchiveWrite.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits