[Cmake-commits] CMake branch, next, updated. v2.8.2-728-g8ab4a4c

[David Cole]

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  8ab4a4ca92cc4a5350fabb144d8a91dd681b6ee0 (commit)
       via  666f328858e5c47a0b2286af95cbc127f28a663b (commit)
       via  2eab3b2cbb3464ae79ce3b39d924f1844b96bd8f (commit)
       via  42dbb43294a229dad30fa1a8d925bdd4c0f47d65 (commit)
      from  9f061b1486bbce0be4e414138639856082ce8baa (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=8ab4a4ca92cc4a5350fabb144d8a91dd681b6ee0
commit 8ab4a4ca92cc4a5350fabb144d8a91dd681b6ee0
Merge: 9f061b1 666f328
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 13:07:45 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 9 13:07:45 2010 -0400

    Merge topic 'preserve-timestamps-on-tar-extract' into next
    
    666f328 Preserve timestamps on files on tar extract.
    2eab3b2 Revert commit: CMake: quote ':' in Windows NMake Makefiles (#9963) -- it was not the right fix and caused mucho other problemo
    42dbb43 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=666f328858e5c47a0b2286af95cbc127f28a663b
commit 666f328858e5c47a0b2286af95cbc127f28a663b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 12:57:14 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 9 12:57:14 2010 -0400

    Preserve timestamps on files on tar extract.
    
    Conversion to libarchive changed the behavior of
    cmake -E tar xzf. This commit fixes that oversight.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 8378922..531616d 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1931,12 +1931,20 @@ bool extract_tar(const char* outFileName, bool verbose,
       }
     if(extract)
       {
+      r = archive_write_disk_set_options(ext, ARCHIVE_EXTRACT_TIME);
+      if (r != ARCHIVE_OK)
+        {
+        cmSystemTools::Error(
+          "Problem with archive_write_disk_set_options(): ",
+          archive_error_string(ext));
+        }
+
       r = archive_write_header(ext, entry);
       if (r != ARCHIVE_OK)
         {
         cmSystemTools::Error("Problem with archive_write_header(): ",
-                             archive_error_string(a));
-        cmSystemTools::Error("Curren file:", 
+                             archive_error_string(ext));
+        cmSystemTools::Error("Current file:",
                              archive_entry_pathname(entry));
         }
       else 

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

Summary of changes:
 Source/cmSystemTools.cxx          |   12 ++++++++++--
 Source/kwsys/System.c             |    3 +--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake