From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26134 invoked by alias); 23 Jul 2008 07:38:36 -0000 Received: (qmail 26101 invoked by uid 9702); 23 Jul 2008 07:38:35 -0000 Date: Wed, 23 Jul 2008 07:38:00 -0000 Message-ID: <20080723073835.26083.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.05-9-g8819aeb X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 4637645af1bbb086b198a008bf6553dfb8bb0157 X-Git-Newrev: 8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00123.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 The branch, STABLE2 has been updated via 8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 (commit) from 4637645af1bbb086b198a008bf6553dfb8bb0157 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 Author: Ryan McCabe Date: Tue Jul 22 15:56:13 2008 -0400 fence: update apc snmp agent Pushing update to fix bz447414 for jparsons ----------------------------------------------------------------------- Summary of changes: fence/agents/apc_snmp/fence_apc_snmp.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 63de054..b635193 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -10,6 +10,7 @@ import getopt, sys import os import datetime +import time import select import signal from glob import glob @@ -341,15 +342,18 @@ def main2(): sys.exit(1) if 'switch' not in params: params['switch'] = '' + + if 'option' not in params: + params['option'] = 'reboot' try: act = params['option'].lower() if act in ['on', 'off', 'reboot', 'status']: params['option'] = act else: - usage() - sys.exit(3) + raise Exception except: - params['option'] = 'reboot' + usage() + sys.exit(3) ### End of validation ### @@ -377,6 +381,7 @@ def main2(): raise Exception, 'Error turning outlet off' elif params['option'] == 'reboot': agent.power_off() + time.sleep(3) if agent.status() != 'off': raise Exception, 'Error turning outlet off' agent.power_on() hooks/post-receive -- Cluster Project