Cluster Project branch, master, updated. cluster-2.99.03-5-gd159687

Cluster Project branch, master, updated. cluster-2.99.03-5-gd159687

[mgrac]

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 "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d159687d6c8be0d91f391a9cfc921cd99fa826fc

The branch, master has been updated
       via  d159687d6c8be0d91f391a9cfc921cd99fa826fc (commit)
      from  34925e9ae54cddda311a682c9131d2d6b84dca7c (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 -----------------------------------------------------------------
commit d159687d6c8be0d91f391a9cfc921cd99fa826fc
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Wed Jun 4 15:54:49 2008 +0200

    [FENCE] Fix: 447378: fence_apc unable to connect via ssh to APC 7900
    
    Increased timeout from SHELL_TIMEOUT to LOGIN_TIMEOUT in login function.

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

Summary of changes:
 fence/agents/lib/fencing.py.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 7c88ad5..16cd284 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -362,19 +362,19 @@ def fence_login(options):
 			result = conn.log_expect(options, [ "ssword:", "Are you sure you want to continue connecting (yes/no)?" ], LOGIN_TIMEOUT)
 			if result == 1:
 				conn.sendline("yes")
-				conn.log_expect(options, "ssword:", SHELL_TIMEOUT)
+				conn.log_expect(options, "ssword:", LOGIN_TIMEOUT)
 			conn.sendline(options["-p"])
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
+			conn.log_expect(options, options["-c"], LOGIN_TIMEOUT)
 		elif options.has_key("-x") and 1 == options.has_key("-k"):
 			conn = fspawn('%s %s@%s -i %s' % (SSH_PATH, options["-l"], options["-a"], options["-k"]))
 			result = conn.log_expect(options, [ options["-c"], "Are you sure you want to continue connecting (yes/no)?", "Enter passphrase for key '"+options["-k"]+"':" ], LOGIN_TIMEOUT)
 			if result == 1:
 				conn.sendline("yes")
-				conn.log_expect(options, [ options["-c"], "Enter passphrase for key '"+options["-k"]+"':"] , SHELL_TIMEOUT)
+				conn.log_expect(options, [ options["-c"], "Enter passphrase for key '"+options["-k"]+"':"] , LOGIN_TIMEOUT)
 			if result != 0:
 				if options.has_key("-p"):
 					conn.sendline(options["-p"])
-					conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
+					conn.log_expect(options, options["-c"], LOGIN_TIMEOUT)
 				else:
 					fail_usage("Failed: You have to enter passphrase (-p) for identity file")
 		else:


hooks/post-receive
--
Cluster Project