From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4804 invoked by alias); 3 Aug 2009 14:03:59 -0000 Received: (qmail 4728 invoked by alias); 3 Aug 2009 14:03:58 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.3 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: RHEL54 - fencing: #493802 - Providing support for ssh enabled RSA II fence devices To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL54 X-Git-Reftype: branch X-Git-Oldrev: 08f5d180d1a6e3b376a2f0864368840ff264700b X-Git-Newrev: 9525957d66b4a45e0352a29c37905fc9f40c0b48 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090803140325.C6247120196@lists.fedorahosted.org> Date: Mon, 03 Aug 2009 14:03: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-q3/txt/msg00146.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9525957d66b4a45e0352a29c37905fc9f40c0b48 Commit: 9525957d66b4a45e0352a29c37905fc9f40c0b48 Parent: 08f5d180d1a6e3b376a2f0864368840ff264700b Author: Marek 'marx' Grac AuthorDate: Mon Aug 3 14:33:16 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Mon Aug 3 14:33:16 2009 +0200 fencing: #493802 - Providing support for ssh enabled RSA II fence devices Fixing differencies between branches. --- fence/agents/rsa/fence_rsa.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index e2ec4dd..487758a 100755 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -8,7 +8,7 @@ ##### import sys, re, pexpect, exceptions -sys.path.append("@FENCEAGENTSLIBDIR@") +sys.path.append("/usr/lib/fence") from fencing import * #BEGIN_VERSION_GENERATION @@ -43,8 +43,6 @@ def main(): "action", "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure" ] - atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) ##