File 0015-CTDB-fix-logging-logfile-version-string-co... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0015-CTDB-fix-logging-logfile-version-string-comparison.patch of Package resource-agents (Revision 4111874daf5e1d0a6ae80986cdabce19)

Currently displaying revision 4111874daf5e1d0a6ae80986cdabce19 , Show latest

From 4066985acdc38b9085173e2b9a2c8277d5480fdd Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Thu, 11 Oct 2018 00:57:20 +0200
Subject: [PATCH] CTDB: fix --logging/--logfile version string comparison

As per "VERSION" in the Samba/CTDB source tree, versions may have:
- a beta/rc/etc string immediately following the third version
  component
  + e.g. 4.0.0rc1
- a -VENDOR trailer
  + e.g. 4.0.0-VendorVersion
- a .GIT.$sha hash trailers
  + e.g. 4.0.0.GIT.1a2b3c4d

Trim any of these possible strings with sed prior to performing the
--logging/--logfile version comparison.

Fixes: https://github.com/ClusterLabs/resource-agents/issues/1185

Signed-off-by: David Disseldorp <ddiss@suse.de>

Cherry-picked from 4a31eb72.
---
 heartbeat/CTDB | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heartbeat/CTDB b/heartbeat/CTDB
index 1456ea32..bd97ed79 100755
--- a/heartbeat/CTDB
+++ b/heartbeat/CTDB
@@ -589,7 +589,7 @@ ctdb_start() {
 	local log_option
 	# --logging supported from v4.3.0 and --logfile / --syslog support 
 	# has been removed from newer versions
-	version=$(ctdb version | awk '{print $NF}')
+	version=$(ctdb version | awk '{print $NF}' | sed "s/\.\?[[:alpha:]].*//")
 	ocf_version_cmp "$version" "4.2.14"
 	if [ "$?" -eq "2" ]; then
 		log_option="--logging=file:$OCF_RESKEY_ctdb_logfile"
-- 
2.18.0

Places

File 0015-CTDB-fix-logging-logfile-version-string-comparison.patch of Package resource-agents (Revision 4111874daf5e1d0a6ae80986cdabce19)

Places