Cluster Project branch, STABLE2, updated. cluster-2.03.03-4-gab51857

Cluster Project branch, STABLE2, updated. cluster-2.03.03-4-gab51857

[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=ab51857c0232d079ddbd8ec0a3b9c4c8a7faa645

The branch, STABLE2 has been updated
       via  ab51857c0232d079ddbd8ec0a3b9c4c8a7faa645 (commit)
      from  1bbfe738c11b227e4361374f63d2fd66507f918b (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 ab51857c0232d079ddbd8ec0a3b9c4c8a7faa645
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 634f638..6d2cf2c 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -349,19 +349,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 ('ssh ' + options["-l"] + "@" + options["-a"] + " -i " + 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