[Cmake-commits] CMake branch, next, updated. v2.8.7-2084-g31c644d

[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  31c644d908af3d2e85a656576b6901c7a4580500 (commit)
       via  768cf9183174e11c36c431d80e95ced2f5f9d2ad (commit)
      from  4992dfa97dadfba618992a4c57270fb6b5d501e9 (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=31c644d908af3d2e85a656576b6901c7a4580500
commit 31c644d908af3d2e85a656576b6901c7a4580500
Merge: 4992dfa 768cf91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 13:49:11 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 13:49:11 2012 -0500

    Merge topic 'fixSymlinkInZIP' into next
    
    768cf91 Do not add the content of a file if it's a symlink.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=768cf9183174e11c36c431d80e95ced2f5f9d2ad
commit 768cf9183174e11c36c431d80e95ced2f5f9d2ad
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 10 23:19:41 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 13:48:14 2012 -0500

    Do not add the content of a file if it's a symlink.
    
    This wasn't necessary for TAR-like (TGZ, TBZ2, etc...) archive
    because for those the size was 0. Either there is an error in
    upstream libarchive concerning the size or we should not rely
    on size of the entry for adding content.

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index eab8a59..dc6b749 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -247,10 +247,14 @@ bool cmArchiveWrite::AddFile(const char* file,
     return false;
     }
 
-  // Content.
-  if(size_t size = static_cast<size_t>(archive_entry_size(e)))
+  // do not copy content of symlink
+  if (!archive_entry_symlink(e))
     {
-    return this->AddData(file, size);
+    // Content.
+    if(size_t size = static_cast<size_t>(archive_entry_size(e)))
+      {
+      return this->AddData(file, size);
+      }
     }
   return true;
 }

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

Summary of changes:


hooks/post-receive
-- 
CMake