From 0b634a5cb5f4fa779b2111c9267b3d2dbc07b7b6 Mon Sep 17 00:00:00 2001 From: Marek 'marx' Grac <mgrac@redhat.com> Date: Wed, 4 Nov 2009 11:30:11 +0100 Subject: [PATCH 1/5] fencing: fence_apc unable to obtain plug status In some cases APC can have additional output. Resolves: bz#532916 --- 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 ced7d39..3a8c194 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -71,7 +71,7 @@ def get_power_status(conn, options): while True: exp_result = conn.log_expect(options, [ options["-c"], "Press <ENTER>" ], int(options["-Y"])) 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): -- 1.6.2.5