[Cmake-commits] CMake branch, next, updated. v2.8.7-2066-g8c508d2

[Eric Noulard]

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  8c508d230187b6f03a38b53220717989d08f4d82 (commit)
       via  c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3 (commit)
       via  53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf (commit)
      from  fab6cbf37535b9e253972d075ab66684e26de555 (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=8c508d230187b6f03a38b53220717989d08f4d82
commit 8c508d230187b6f03a38b53220717989d08f4d82
Merge: fab6cbf c43a18e
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Jan 11 08:57:49 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 08:57:49 2012 -0500

    Merge topic 'fixSymlinkInZIP' into next
    
    c43a18e Fix indentation style
    53da978 Do not add the content of a file if it's a symlink.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3
commit c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Jan 11 14:55:09 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Jan 11 14:55:09 2012 +0100

    Fix indentation style

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index d506760..e3f2299 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -250,11 +250,11 @@ bool cmArchiveWrite::AddFile(const char* file,
   // do not copy content of symlink
   if (!(archive_entry_filetype(e) & AE_IFLNK))
     {
-      // Content.
-      if(size_t size = static_cast<size_t>(archive_entry_size(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;
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf
commit 53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 10 23:19:41 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jan 10 23:19:41 2012 +0100

    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..d506760 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_filetype(e) & AE_IFLNK))
     {
-    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:
 Source/cmArchiveWrite.cxx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake