fence-agents: master - fence_apc: --shell-timeout was used instead of --power-timeout

Marek GrĂ¡c marx at fedoraproject.org
Mon Sep 22 14:39:23 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=f07ee2abe99ef84ed4bf18b2df111d4c2bb1f43c
Commit:        f07ee2abe99ef84ed4bf18b2df111d4c2bb1f43c
Parent:        316ecfbad27231ced5c383d16a4f06a1679c90da
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Sep 22 14:46:43 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Sep 22 14:46:43 2014 +0200

fence_apc: --shell-timeout was used instead of --power-timeout

---
 fence/agents/apc/fence_apc.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index 83bfe07..f2080f1 100644
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -170,9 +170,9 @@ def set_power_status(conn, options):
 	conn.send_eol(action)
 	conn.log_expect(options, "Enter 'YES' to continue or <ENTER> to cancel :", int(options["--shell-timeout"]))
 	conn.send_eol("YES")
-	conn.log_expect(options, "Press <ENTER> to continue...", int(options["--shell-timeout"]))
+	conn.log_expect(options, "Press <ENTER> to continue...", int(options["--power-timeout"]))
 	conn.send_eol("")
-	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
+	conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"]))
 	conn.send(chr(03))
 	conn.log_expect(options, "- Logout", int(options["--shell-timeout"]))
 	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))


More information about the cluster-commits mailing list