[packages/fence-agents] - updated to 4.0.10 - updated check patch

qboosh qboosh at pld-linux.org
Sat Jul 5 08:45:26 CEST 2014


commit 45cde7bb24fc348b0dcd3fad98d91a5c0f017771
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 5 08:49:57 2014 +0200

    - updated to 4.0.10
    - updated check patch

 fence-agents-check.patch | 12 ++++++------
 fence-agents.spec        |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/fence-agents.spec b/fence-agents.spec
index 12ec7be..54a89fa 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -5,12 +5,12 @@
 Summary:	Reusable cluster fencing scripts
 Summary(pl.UTF-8):	Skrypty barier klastrowych wielokrotnego użytku
 Name:		fence-agents
-Version:	4.0.8
+Version:	4.0.10
 Release:	1
 License:	GPL v2+ (libraries), LGPL v2.1+ (applications)
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
-# Source0-md5:	13334ea0477dfde9b876ddeee4b61aa8
+# Source0-md5:	3e7466a507f10cc5d2c3e49da84946f9
 Patch0:		%{name}-check.patch
 URL:		https://fedorahosted.org/cluster/wiki/HomePage
 BuildRequires:	autoconf >= 2.63
@@ -72,7 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/fence_*
 %attr(755,root,root) %{_libexecdir}/fence_kdump_send
 %{_datadir}/fence
-%{_datadir}/cluster/fence_scsi_check.pl
 %dir %{_datadir}/cluster/relaxng
 %{_datadir}/cluster/relaxng/fence.rng.head
 %{_datadir}/cluster/relaxng/fence.rng.tail
diff --git a/fence-agents-check.patch b/fence-agents-check.patch
index 07e9d64..af35181 100644
--- a/fence-agents-check.patch
+++ b/fence-agents-check.patch
@@ -1,5 +1,5 @@
---- fence-agents-4.0.5/fence/agents/lib/check_used_options.py.orig	2013-10-22 17:06:49.000000000 +0200
-+++ fence-agents-4.0.5/fence/agents/lib/check_used_options.py	2013-11-01 09:35:22.583722951 +0100
+--- fence-agents-4.0.10/fence/agents/lib/check_used_options.py.orig	2014-07-01 12:53:45.000000000 +0200
++++ fence-agents-4.0.10/fence/agents/lib/check_used_options.py	2014-07-05 08:41:55.273724364 +0200
 @@ -22,6 +22,10 @@
  
  	## add UUID which is derived automatically from --plug if possible
@@ -13,14 +13,14 @@
  	agent_file = open(agent)
 @@ -48,12 +52,12 @@
  
- 		for x in option_use_re.findall(line):
- 			if not available.has_key(x):
+ 		for option in option_use_re.findall(line):
+ 			if not available.has_key(option):
 -				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_use_re.search(line).group(1))
 +				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, x)
  				without_errors = False
  
- 		for x in option_has_re.findall(line):
- 			if not available.has_key(x):
+ 		for option in option_has_re.findall(line):
+ 			if not available.has_key(option):
 -				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_has_re.search(line).group(1))
 +				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, x)
  				without_errors = False
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fence-agents.git/commitdiff/45cde7bb24fc348b0dcd3fad98d91a5c0f017771



More information about the pld-cvs-commit mailing list