[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1014-g6e7305e

[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  6e7305e92f0ddedfe6eedb475d2eafb3f208d26b (commit)
       via  35bcecc0482cb85d42296afed8f26118721fbbd9 (commit)
      from  f9a511901132f9adfec51c58097db0aaf26c2098 (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=6e7305e92f0ddedfe6eedb475d2eafb3f208d26b
commit 6e7305e92f0ddedfe6eedb475d2eafb3f208d26b
Merge: f9a5119 35bcecc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 11:35:35 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 11:35:35 2014 -0500

    Merge topic 'file-LOCK-command' into next
    
    35bcecc0 cmFileLockUnix: Treat EACCES like EAGAIN


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35bcecc0482cb85d42296afed8f26118721fbbd9
commit 35bcecc0482cb85d42296afed8f26118721fbbd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 11:33:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 2 11:33:32 2014 -0500

    cmFileLockUnix: Treat EACCES like EAGAIN
    
    The fcntl call may set errno to either of these when failing to
    lock an already-locked file.

diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index 5b0db69..038011e 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -72,7 +72,7 @@ cmFileLockResult cmFileLock::LockWithTimeout(unsigned seconds)
     {
     if (this->LockFile(F_SETLK, F_WRLCK) == -1)
       {
-      if (errno != EAGAIN)
+      if (errno != EACCES && errno != EAGAIN)
         {
         return cmFileLockResult::MakeSystem();
         }

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

Summary of changes:
 Source/cmFileLockUnix.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake