[Cmake-commits] CMake branch, master, updated. ea62d6973b657041021f00c67726cf476acd2424

[cmake-commits at cmake.org]

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, master has been updated
       via  ea62d6973b657041021f00c67726cf476acd2424 (commit)
      from  1c13ced6eb23e5950051b0e4f102a7f4a54e77dc (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=ea62d6973b657041021f00c67726cf476acd2424
commit ea62d6973b657041021f00c67726cf476acd2424
Author: Brad King <brad.king at kitware.com>
Date:   Wed May 5 14:39:51 2010 -0400

    Do not list file names during 'cmake -E tar xz'
    
    Since commit "Switch to using libarchive from libtar" (2009-10-30) the
    the implementation of "tar xz" has printed all paths from the tarball as
    a single line with no separator.  This fixes the logic to extract
    silently as expected.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index d176987..d914203 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2048,12 +2048,13 @@ bool extract_tar(const char* outFileName, bool verbose,
     if (verbose && extract)
       {
       cmSystemTools::Stdout("x ");
+      cmSystemTools::Stdout(archive_entry_pathname(entry));
       }
     if(verbose && !extract)
       {
       list_item_verbose(stdout, entry);
       }
-    else
+    else if(!extract)
       {
       cmSystemTools::Stdout(archive_entry_pathname(entry));
       }

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake