[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-47-g26ae5a2

[fabbione@sourceware.org <fabbione@sourceware.org>]

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=26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e

The branch, master has been updated
       via  26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e (commit)
      from  599cc3275d45e4f69d2cc8d47cc02196ca3dd8bf (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 26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e
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 a2faef4..dea529f 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