[Cmake-commits] CMake branch, next, updated. v3.1.0-2202-g4426234

[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  44262347099d0de4dd421a15e647a7fdb33f83ab (commit)
       via  00eaf2acbc37a0e514e94f0180e9edfc6e804f06 (commit)
      from  41a41e60fdc05c31ce5fafb5b2242fabc207c4db (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=44262347099d0de4dd421a15e647a7fdb33f83ab
commit 44262347099d0de4dd421a15e647a7fdb33f83ab
Merge: 41a41e6 00eaf2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 14:15:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 14:15:34 2015 -0500

    Merge topic 'cmake-E-tar-mtime' into next
    
    00eaf2ac cmake: Teach -E tar to report file name on failure to read from disk


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00eaf2acbc37a0e514e94f0180e9edfc6e804f06
commit 00eaf2acbc37a0e514e94f0180e9edfc6e804f06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 14:14:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 19 14:14:18 2015 -0500

    cmake: Teach -E tar to report file name on failure to read from disk
    
    The libarchive-provided error message does not always include the file
    name, so add it to the message ourselves to ensure users know which file
    fails.

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 47ec736..c24c68e 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -272,7 +272,9 @@ bool cmArchiveWrite::AddFile(const char* file,
   cm_archive_entry_copy_pathname(e, dest);
   if(archive_read_disk_entry_from_file(this->Disk, e, -1, 0) != ARCHIVE_OK)
     {
-    this->Error = "archive_read_disk_entry_from_file: ";
+    this->Error = "archive_read_disk_entry_from_file '";
+    this->Error += file;
+    this->Error += "': ";
     this->Error += cm_archive_error_string(this->Disk);
     return false;
     }
diff --git a/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt
index f9339cc..1fddf6d 100644
--- a/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt
@@ -1,2 +1,2 @@
-^CMake Error: archive_read_disk_entry_from_file:.*--bad
+^CMake Error: archive_read_disk_entry_from_file '--bad':.*
 CMake Error: Problem creating tar: bad.tar$

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

Summary of changes:
 Source/cmArchiveWrite.cxx                            |    4 +++-
 Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake