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

Marek GrĂ¡c marx at fedoraproject.org
Fri Jun 20 14:08:50 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=62d90e3a0827fcdc5be632bdf4103d3c08b39622
Commit:        62d90e3a0827fcdc5be632bdf4103d3c08b39622
Parent:        9caf5a23e58b52e05042674260eb1f1aa6d22558
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 16:06:40 2014 +0200

fence_rsb: Accept new prompt in parsing

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

diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
index 9c1df5f..bcad1de 100755
--- a/fence/agents/rsb/fence_rsb.py
+++ b/fence/agents/rsb/fence_rsb.py
@@ -30,6 +30,8 @@ def set_power_status(conn, options):
 	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
 	conn.send_eol(action)
 	conn.log_expect(options, ["want to power off", "'yes' or 'no'"], int(options["--shell-timeout"]))
+	conn.log_expect(options, ["want to power " + options["--action"], 
+			"yes/no", "'yes' or 'no'"], int(options["--shell-timeout"]))
 	conn.send_eol("yes")
 	conn.log_expect(options, "any key to continue", int(options["--power-timeout"]))
 	conn.send_eol("")


More information about the cluster-commits mailing list