fence-agents: master - fence_rsb: Change in power status output

Marek GrĂ¡c marx at fedoraproject.org
Wed Oct 23 07:47:52 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=9c3cf5bfe41559191510c32be9195da6ee00d06d
Commit:        9c3cf5bfe41559191510c32be9195da6ee00d06d
Parent:        0b92cea4cb27f248834d77a72266ba5bf69c1d95
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Oct 23 09:46:44 2013 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Oct 23 09:46:44 2013 +0200

fence_rsb: Change in power status output

Regular expression was extended to support newer version.

Patch by: Christian Masopust
---
 fence/agents/rsb/fence_rsb.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
index 1da186f..da60a61 100755
--- a/fence/agents/rsb/fence_rsb.py
+++ b/fence/agents/rsb/fence_rsb.py
@@ -13,7 +13,7 @@ BUILD_DATE=""
 def get_power_status(conn, options):
 	conn.send("2")
 	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
-	status = re.compile("Power Status : (on|off)", re.IGNORECASE).search(conn.before).group(1)
+	status = re.compile("Power Status[\s]*: (on|off)", re.IGNORECASE).search(conn.before).group(1)
 	conn.send("0")
 	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
 


More information about the cluster-commits mailing list