fence-agents: RHEL6 - fence_brocade: update backported patch for older library

Marek GrĂ¡c marx at fedoraproject.org
Wed Jul 2 19:00:31 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=fbbfd49ca088afe1e48127ae134b8671659fee15
Commit:        fbbfd49ca088afe1e48127ae134b8671659fee15
Parent:        d2e3a5e8077bacf70a97a06e9ddd80bfcd8f482d
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Jul 2 10:47:22 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Jul 2 10:47:22 2014 +0200

fence_brocade: update backported patch for older library

---
 fence/agents/brocade/fence_brocade.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fence/agents/brocade/fence_brocade.py b/fence/agents/brocade/fence_brocade.py
index 0ab669a..4bd28b6 100644
--- a/fence/agents/brocade/fence_brocade.py
+++ b/fence/agents/brocade/fence_brocade.py
@@ -27,7 +27,7 @@ def get_power_status(conn, options):
 	in_index = False
 
 	conn.send_eol("switchshow")
-	conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"]))
+	conn.log_expect(options, options["-c"], int(options["-g"]))
 	for line in str(conn.before).split("\n"):
 		if line_re.search(line):
 			in_index = True
@@ -36,8 +36,8 @@ def get_power_status(conn, options):
 			status = "off" if len(tokens) > 7 and tokens[7] == "Disabled" else "on"
 			outlets[tokens[0]] = ("", status)
 
-	if options["--action"] == "status":
-		(_, status) = outlets[options["--plug"]]
+	if options["-o"] == "status":
+		(_, status) = outlets[options["-n"]]
 		return status
 	else:
 		return outlets


More information about the cluster-commits mailing list