cluster: STABLE3 - fence_apc: fence_apc fails to fence node - Unable to obtain plug status

[Marek Grác]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        e97692e42ffb901388ad2586ca93e91f6c509c8a
Parent:        0ca4ceac557b8ec2e106135366b137451ab33f8e
Author:        Marek 'marx' Grac <mgrac(a)redhat.com&gt;
AuthorDate:    Wed Sep 23 13:55:18 2009 +0200
Committer:     Marek 'marx' Grac <mgrac(a)redhat.com&gt;
CommitterDate: Wed Sep 23 13:55:18 2009 +0200

fence_apc: fence_apc fails to fence node - Unable to obtain plug status

New firmware allows new ouput:

 1- Outlet 1:1  shell-01                ON        Graceful Shutdown

Resolves: bz#517860
---
 fence/agents/apc/fence_apc.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index e4a3e3d..a48877e 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -70,7 +70,7 @@ def get_power_status(conn, options):
 		while True:
 			exp_result = conn.log_expect(options, [ options["-c"],  "Press
<ENTER>" ], SHELL_TIMEOUT)
 			lines = conn.before.split("\n");
-			show_re = re.compile('^\s*(\d+)- (.*?)\s+(ON|OFF)\s*$')
+			show_re = re.compile('^\s*(\d+)- (.*?)\s+(ON|OFF)\s*')
 			for x in lines:
 				res = show_re.search(x)
 				if (res != None):