From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4068 invoked by alias); 26 Jun 2009 11:36:14 -0000 Received: (qmail 4016 invoked by alias); 26 Jun 2009 11:36:13 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL4 - fence_wti: #508268 - Fence agent for WTI ends with traceback when option is missing To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 7868c811ac968bc973ab452f5bcf1676d65565bd X-Git-Newrev: dc3627fc32acc1e79f251a6aaab7b362920323aa From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090626113548.942201201EE@lists.fedorahosted.org> Date: Fri, 26 Jun 2009 11:36:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00774.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dc3627fc32acc1e79f251a6aaab7b362920323aa Commit: dc3627fc32acc1e79f251a6aaab7b362920323aa Parent: 7868c811ac968bc973ab452f5bcf1676d65565bd Author: Marek 'marx' Grac AuthorDate: Fri Jun 26 13:25:17 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Fri Jun 26 13:32:14 2009 +0200 fence_wti: #508268 - Fence agent for WTI ends with traceback when option is missing Login name/password are NOT required for WTI, so they have to be checked after login/password is encountered. --- fence/agents/wti/fence_wti.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index a04de4a..6335df7 100755 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -92,12 +92,18 @@ def main(): result = conn.log_expect(options, [ re_login, "Password: ", re_prompt ], SHELL_TIMEOUT) if result == 0: - conn.send(options["-l"]+"\r\n") - result = conn.log_expect(options, [ re_login, "Password: ", re_prompt ], SHELL_TIMEOUT) + if options.has_key("-l"): + conn.send(options["-l"]+"\r\n") + result = conn.log_expect(options, [ re_login, "Password: ", re_prompt ], SHELL_TIMEOUT) + else: + fail_usage("Failed: You have to set login name") if result == 1: - conn.send(options["-p"]+"\r\n") - conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + if options.has_key("-p"): + conn.send(options["-p"]+"\r\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + else: + fail_usage("Failed: You have to enter password or password script") except pexpect.EOF: fail(EC_LOGIN_DENIED) except pexpect.TIMEOUT: