public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: "Marek Grác" <marx@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: RHEL54 - fencing: #501586 - fence agents fails with pexpect exception
Date: Fri, 24 Jul 2009 11:47:00 -0000 [thread overview]
Message-ID: <20090724114655.D25E1120196@lists.fedorahosted.org> (raw)
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=82a489cba5637cfcebf43a6e8b3312e8a4555351
Commit: 82a489cba5637cfcebf43a6e8b3312e8a4555351
Parent: 188db164825505dfecd32b8eb4a53a1349557280
Author: Marek Grac <mgrac@redhat.com>
AuthorDate: Thu Jul 23 11:32:41 2009 +0200
Committer: Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri Jul 24 13:42:20 2009 +0200
fencing: #501586 - fence agents fails with pexpect exception
Added import exceptions. Fence agent for VMWare was not checked for these
exceptions.
---
fence/agents/bladecenter/fence_bladecenter.py | 2 +-
fence/agents/drac/fence_drac5.py | 2 +-
fence/agents/lpar/fence_lpar.py | 2 +-
fence/agents/rsa/fence_rsa.py | 2 +-
fence/agents/virsh/fence_virsh.py | 2 +-
fence/agents/vmware/fence_vmware.py | 11 ++++++++---
fence/agents/wti/fence_wti.py | 2 +-
7 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
index 3e7204a..518f6a6 100755
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -13,7 +13,7 @@
##
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
index 556ccb3..cdea52c 100755
--- a/fence/agents/drac/fence_drac5.py
+++ b/fence/agents/drac/fence_drac5.py
@@ -12,7 +12,7 @@
## @note: drac_version was removed
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 6e0d848..4c6f997 100755
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -11,7 +11,7 @@
##
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index e7f131c..e2ec4dd 100755
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -7,7 +7,7 @@
##
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("@FENCEAGENTSLIBDIR@")
from fencing import *
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
index 15885c6..c5eb935 100644
--- a/fence/agents/virsh/fence_virsh.py
+++ b/fence/agents/virsh/fence_virsh.py
@@ -6,7 +6,7 @@
##
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index 3cbb900..1aa0a1e 100755
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -7,7 +7,7 @@
##
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
@@ -104,8 +104,13 @@ def main():
##
## Logout from system
######
- conn.sendline("logout")
- conn.close()
+ try:
+ conn.sendline("logout")
+ conn.close()
+ except exceptions.OSError:
+ pass
+ except pexpect.ExceptionPexpect:
+ pass
if __name__ == "__main__":
main()
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index 5740cd4..e20a16c 100755
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -12,7 +12,7 @@
## WTI IPS-800-CE v1.40h (no username)
#####
-import sys, re, pexpect
+import sys, re, pexpect, exceptions
sys.path.append("/usr/lib/fence")
from fencing import *
reply other threads:[~2009-07-24 11:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090724114655.D25E1120196@lists.fedorahosted.org \
--to=marx@fedoraproject.org \
--cc=cluster-cvs-relay@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).