From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9840 invoked by alias); 21 Jul 2008 13:53:19 -0000 Received: (qmail 9807 invoked by uid 9470); 21 Jul 2008 13:53:18 -0000 Date: Mon, 21 Jul 2008 13:53:00 -0000 Message-ID: <20080721135318.9790.qmail@sourceware.org> From: jparsons@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-83-gfb39153 X-Git-Refname: refs/heads/RHEL47 X-Git-Reftype: branch X-Git-Oldrev: 0949bb8d8f145a8fe4121cf530d500d3125ab426 X-Git-Newrev: fb391530844c929a00b1621893b80722beb67228 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/msg00105.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=fb391530844c929a00b1621893b80722beb67228 The branch, RHEL47 has been updated via fb391530844c929a00b1621893b80722beb67228 (commit) from 0949bb8d8f145a8fe4121cf530d500d3125ab426 (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 fb391530844c929a00b1621893b80722beb67228 Author: jparsons Date: Mon Jul 21 09:47:37 2008 -0400 Fix for bz447414 ----------------------------------------------------------------------- Summary of changes: fence/agents/apc_snmp/fence_apc_snmp.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 9fd0c14..f2b34fa 100755 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -28,9 +28,9 @@ import signal from glob import glob #BEGIN_VERSION_GENERATION -FENCE_RELEASE_NAME="" -REDHAT_COPYRIGHT="" -BUILD_DATE="" +FENCE_RELEASE_NAME="2.0.84"; +REDHAT_COPYRIGHT=("Copyright (C) Red Hat, Inc. 2004 All rights reserved.") +BUILD_DATE="(built Tue Apr 15 16:19:29 EDT 2008)"; #END_VERSION_GENERATION POWER_ON="outletOn" @@ -117,9 +117,9 @@ class FenceAgent: def status(self): oid = self.status_oid % self.resolve_outlet() dummy, stat = self.snmp.get(oid) - if stat == self.state_on: + if stat == self.state_on or stat == "outletStatusOn": return 'on' - elif stat == self.state_off: + elif stat == self.state_off or stat == "outletStatusOff": return 'off' else: raise Exception, 'invalid status ' + stat hooks/post-receive -- Cluster Project