cluster: RHEL4 - fence_apc: #501890 - fence_apc fails with pexpect exception

cluster: RHEL4 - fence_apc: #501890 - fence_apc fails with pexpect exception

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=874205aa70b58a069d3f25b344bb4b7b7a644232
Commit:        874205aa70b58a069d3f25b344bb4b7b7a644232
Parent:        e4a4744a154a6acaf41579f99c0b04be447b8182
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Thu May 21 10:52:51 2009 +0200
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Thu May 21 10:52:51 2009 +0200

fence_apc: #501890 -  fence_apc fails with pexpect exception

---
 fence/agents/apc/fence_apc.py |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index 6d91996..b0cbfcc 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -199,11 +199,20 @@ def main():
 	conn = fence_login(options)
 	fence_action(conn, options, set_power_status, get_power_status)
 
-	##
-	## Logout from system
-	######
-	conn.sendline("4")
-	conn.close()
+        ##
+        ## Logout from system
+        ##
+        ## In some special unspecified cases it is possible that 
+        ## connection will be closed before we run close(). This is not 
+        ## a problem because everything is checked before.
+        ######
+        try:
+		conn.sendline("4")
+		conn.close()
+	except exceptions.OSError:
+		pass
+	except pexpect.ExceptionPexpect:
+		pass
 
 if __name__ == "__main__":
 	main()