Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-85-g36ccb96

Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-85-g36ccb96

[rmccabe]

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=36ccb96c5c37c3f6216c7ff1f7f97e81321cfcd5

The branch, RHEL47 has been updated
       via  36ccb96c5c37c3f6216c7ff1f7f97e81321cfcd5 (commit)
      from  ce14cd5d505151b146731ceef64db3a9a136547a (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 36ccb96c5c37c3f6216c7ff1f7f97e81321cfcd5
Author: Ryan McCabe <rmccabe@redhat.com>
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 9a365b0..1bef396 100755
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -23,6 +23,7 @@
 import getopt, sys
 import os
 import datetime
+import time
 import select
 import signal
 from glob import glob
@@ -354,15 +355,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 ###
 
@@ -390,6 +394,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