[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH 5/5] Cleanup of fence_xenapi patches. Added copyright information to doc/COPYRIGHT. Fixed static reference to lib directory in fence_xenapi.py. Fixed static reference to RELEASE_VERSION and BUILD_DATE in fence_xenapi.py.



---
 doc/COPYRIGHT                       |    4 ++++
 fence/agents/lib/Makefile.am        |    4 ++--
 fence/agents/xenapi/fence_xenapi.py |   12 ++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index b10071c..5afc642 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -5,6 +5,10 @@ Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
 
 Exceptions:
 
+fence/agents/xenapi/*:
+ Copyright (C) 2011 Matthew Clark.
+ Author: Matthew Clark <mattjclark0407 at hotmail.com>
+ 
 fence/agents/apc_snmp/powernet369.mib:
  Copyright (c) 2005 American Power Conversion, Inc.
  PowerNet is a Trademark of American Power Conversion Corp.
diff --git a/fence/agents/lib/Makefile.am b/fence/agents/lib/Makefile.am
index b42fc12..aa6d072 100644
--- a/fence/agents/lib/Makefile.am
+++ b/fence/agents/lib/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-TARGET			= fencing.py fencing_snmp.py
+TARGET			= fencing.py fencing_snmp.py XenAPI.py
 
-SRC			= fencing.py.py fencing_snmp.py.py
+SRC			= fencing.py.py fencing_snmp.py.py XenAPI.py.py
 
 EXTRA_DIST		= $(SRC) fence2man.xsl
 
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py
index 0657f4e..cae53e6 100755
--- a/fence/agents/xenapi/fence_xenapi.py
+++ b/fence/agents/xenapi/fence_xenapi.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 #############################################################################
-# Copyright 2011 Matt Clark
+# Copyright 2011 Matthew Clark
 # This file is part of fence-xenserver
 #
 # fence-xenserver is free software: you can redistribute it and/or modify
@@ -32,10 +32,16 @@
 # whether I should continue support for it. mattjclark0407 at hotmail dot com
 
 import sys
-sys.path.append("/usr/lib/fence")
+sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 import XenAPI
 
+#BEGIN_VERSION_GENERATION
+RELEASE_VERSION=""
+REDHAT_COPYRIGHT=""
+BUILD_DATE=""
+#END_VERSION_GENERATION
+
 EC_BAD_SESSION 		= 1
 # Find the status of the port given in the -U flag of options.
 def get_power_fn(session, options):
@@ -223,5 +229,3 @@ the status of virtual machines running on the host."
 
 if __name__ == "__main__":
 	main()
-RELEASE_VERSION="3.1.2.11-2b5b-dirty"
-BUILD_DATE="(built Fri Mar 25 22:57:28 EST 2011)"
-- 
1.7.0.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]