fence-agents: master - [cleanup] Cleaning in fence_raritan

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=665b26cd5...
Commit:        665b26cd5c98877a85d69bc00fa6860b511b6f14
Parent:        4faf748e7fe50c2665f546df479514d98872f2fa
Author:        Marek 'marx' Grac 
AuthorDate:    Fri Apr 11 10:48:43 2014 +0200
Committer:     Marek 'marx' Grac 
CommitterDate: Fri Apr 11 10:48:43 2014 +0200

[cleanup] Cleaning in fence_raritan

Previous set of patches was prepared without this new fence agent.
---
 fence/agents/raritan/fence_raritan.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fence/agents/raritan/fence_raritan.py b/fence/agents/raritan/fence_raritan.py
index 01059ce..3318fbf 100644
--- a/fence/agents/raritan/fence_raritan.py
+++ b/fence/agents/raritan/fence_raritan.py
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt

-import sys, re, pexpect, exceptions
+import sys, re, pexpect
 import atexit
 import time
 sys.path.append("@FENCEAGENTSLIBDIR@")
@@ -60,7 +60,7 @@ block any necessary fencing actions."

#  add support also for delay before login which is very useful for 2-node clusters
    if options["--action"] in ["off", "reboot"]:
-                time.sleep(int(options["--delay"]))
+		time.sleep(int(options["--delay"]))

##
    ## Operate the fencing device
@@ -70,7 +70,7 @@ block any necessary fencing actions."
    	conn = fspawn(options, TELNET_PATH)
    	conn.send("set binary\n")
    	conn.send("open %s -%s\n"%(options["--ip"], options["--ipport"]))
-		screen = conn.read_nonblocking(size=100, timeout=int(options["--shell-timeout"]))
+		conn.read_nonblocking(size=100, timeout=int(options["--shell-timeout"]))
    	conn.log_expect(options, "Login.*", int(options["--shell-timeout"]))
    	conn.send_eol("%s" % (options["--username"]))
    	conn.log_expect(options, "Password.*", int(options["--shell-timeout"]))