fence-agents: RHEL6 - fence_rsb: Accept new prompt in parsing

Marek GrĂ¡c marx at fedoraproject.org
Mon Jun 23 11:45:41 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=3d471cad9d71706f938a177661a97fc3eed7237a
Commit:        3d471cad9d71706f938a177661a97fc3eed7237a
Parent:        9c38cbf1b3e474b6a8eff80f4b8a719047792855
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Fri Jun 20 15:37:40 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Fri Jun 20 15:37:40 2014 +0200

fence_rsb: Accept new prompt in parsing

Resolves: rhbz#1110428
---
 fence/agents/rsb/fence_rsb.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
index 7ce1906..0353071 100755
--- a/fence/agents/rsb/fence_rsb.py
+++ b/fence/agents/rsb/fence_rsb.py
@@ -34,7 +34,8 @@ def set_power_status(conn, options):
 		conn.send("2")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 		conn.send_eol(action)
-		conn.log_expect(options, ["want to power off", "'yes' or 'no'"], int(options["-Y"]))
+		conn.log_expect(options, ["want to power " + options["-o"], 
+			"yes/no", "'yes' or 'no'"], int(options["-Y"]))
 		conn.send_eol("yes")
 		conn.log_expect(options, "any key to continue", int(options["-g"]))
 		conn.send_eol("")


More information about the cluster-commits mailing list