[Cmake-commits] CMake branch, next, updated. v2.8.4-1455-g2e9509b

[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  2e9509bb84e3ec50c0445ab14226e7aec04ec561 (commit)
       via  12a3699372277916d11af5fe1eb2768e704ecb33 (commit)
      from  890d2b2fd8d4222927e5858622ee8a81adaf98a0 (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=2e9509bb84e3ec50c0445ab14226e7aec04ec561
commit 2e9509bb84e3ec50c0445ab14226e7aec04ec561
Merge: 890d2b2 12a3699
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 18 11:37:20 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 18 11:37:20 2011 -0400

    Merge topic 'add-svn-trust-cert-to-ExternalProject' into next
    
    12a3699 ExternalProject: Always use --non-interactive with svn


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12a3699372277916d11af5fe1eb2768e704ecb33
commit 12a3699372277916d11af5fe1eb2768e704ecb33
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 18 11:34:00 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Apr 18 11:34:00 2011 -0400

    ExternalProject: Always use --non-interactive with svn
    
    The previous commit added --non-interactive as a "side effect"
    of turning on SVN_TRUST_CERT. While reviewing that commit, we
    decided all ExternalProject svn usage should be non-interactive.
    
    That way, if there's any sort of problem, svn will return an
    error right away rather than hang forever waiting for input...

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index c910a56..a37771b 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1049,10 +1049,10 @@ function(_ep_add_download_command name)
       set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
     endif()
     if(svn_trust_cert)
-      set(svn_trust_cert_args --non-interactive --trust-server-cert)
+      set(svn_trust_cert_args --trust-server-cert)
     endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
-      ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
+      --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
     list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
   elseif(git_repository)
     find_package(Git)
@@ -1205,10 +1205,10 @@ function(_ep_add_update_command name)
       set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
     endif()
     if(svn_trust_cert)
-      set(svn_trust_cert_args --non-interactive --trust-server-cert)
+      set(svn_trust_cert_args --trust-server-cert)
     endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
-      ${svn_trust_cert_args} ${svn_user_pw_args})
+      --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args})
     set(always 1)
   elseif(git_repository)
     if(NOT GIT_EXECUTABLE)

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

Summary of changes:
 Modules/ExternalProject.cmake |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake