From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12107 invoked by alias); 22 Mar 2009 14:22:51 -0000 Received: (qmail 12098 invoked by alias); 22 Mar 2009 14:22:51 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 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 bastion.fedora.phx.redhat.com Subject: fence-agents: master - fence_snmp_*: Add missed sys.path.apend to SNMP agents To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 6f873faf451a3c7cb9bb0404a250c5de46d0ade0 X-Git-Newrev: 38493ef91b33d4ba4e6f4f6d5adebec936ca8c67 From: Jan Friesse Message-Id: <20090322142233.D21F7120212@lists.fedorahosted.org> Date: Sun, 22 Mar 2009 14:22: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-q1/txt/msg00860.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=38493ef91b33d4ba4e6f4f6d5adebec936ca8c67 Commit: 38493ef91b33d4ba4e6f4f6d5adebec936ca8c67 Parent: 6f873faf451a3c7cb9bb0404a250c5de46d0ade0 Author: Jan Friesse AuthorDate: Sun Mar 22 15:22:03 2009 +0100 Committer: Jan Friesse CommitterDate: Sun Mar 22 15:22:03 2009 +0100 fence_snmp_*: Add missed sys.path.apend to SNMP agents If fencing.py and fencing_snmp.py is not installed in Python's search path, Python based fence agent will fall. This was (sadly) the case of SNMP based agents. This patch add sys.path.append to start of file, so everything should work now. --- fence/agents/apc_snmp/fence_apc_snmp.py | 1 + fence/agents/cisco_mds/fence_cisco_mds.py | 1 + fence/agents/ibmblade/fence_ibmblade.py | 1 + fence/agents/ifmib/fence_ifmib.py | 1 + fence/agents/intelmodular/fence_intelmodular.py | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 8ffd7fc..8cdb169 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -9,6 +9,7 @@ # MN:AP7951 HR:B2) - SNMP v1 import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * from fencing_snmp import * diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index 177c3b1..76a45d4 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -7,6 +7,7 @@ # with BIOS 1.0.16, kickstart 4.1(1c), system 4.1(1c) import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * from fencing_snmp import * diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 3c9ecf1..073da78 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -1,6 +1,7 @@ #!/usr/bin/python import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * from fencing_snmp import * diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 766a96d..0f955ac 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -9,6 +9,7 @@ # Only lance if is visible import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * from fencing_snmp import * diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 8cfa0ae..ea2453a 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -12,6 +12,7 @@ # Thanks Matthew Kent for original agent and testing. import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * from fencing_snmp import *