summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-05-05 18:39:51 (GMT)
committerBrad King <brad.king@kitware.com>2010-05-05 18:44:36 (GMT)
commitea62d6973b657041021f00c67726cf476acd2424 (patch)
treee298f1018ccb5121e9b9e30d80070c31da2186f3
parent1c13ced6eb23e5950051b0e4f102a7f4a54e77dc (diff)
downloadCMake-ea62d6973b657041021f00c67726cf476acd2424.zip
CMake-ea62d6973b657041021f00c67726cf476acd2424.tar.gz
CMake-ea62d6973b657041021f00c67726cf476acd2424.tar.bz2
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.
-rw-r--r--Source/cmSystemTools.cxx3
1 files changed, 2 insertions, 1 deletions
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));
}