File 0017-CTDB-fix-version-string-with-vendor-traile... of Package resource-agents.11673

Overview Repositories Revisions Requests Users Attributes Meta

File 0017-CTDB-fix-version-string-with-vendor-trailer-comparis.patch of Package resource-agents.11673

From 65ef56a0123d5b5026550bd28882fd82e49c30ea Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power@suse.com>
Date: Thu, 16 May 2019 12:26:57 +0100
Subject: [PATCH] CTDB: fix version string with vendor trailer comparison

commit 4a31eb7 should handle a -VENDOR trailer
+ e.g. 4.0.0-VendorVersion

however when using the sed from 4a31eb7 on a version string with vendor trailer e.g.

echo "4.0.0-VendorVersion" | awk '{print $NF}' | sed "s/.?[[:alpha:]].*//"

yields

4.0.0-

after fix

echo "4.0.0rc1" | awk '{print $NF}' | sed "s/[-\.]\?[[:alpha:]].*//"
4.0.0

echo "4.0.0-VendorVersion" | awk '{print $NF}' | sed "s/[-\.]\?[[:alpha:]].*//"
4.0.0

echo "4.0.0.GIT.1a2b3c4d" | awk '{print $NF}' | sed "s/[-\.]\?[[:alpha:]].*//"
4.0.0

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

Signed-off-by: Noel Power <noel.power@suse.com>
---
 heartbeat/CTDB.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heartbeat/CTDB.in b/heartbeat/CTDB.in
index bbf8ef62..2b0d6b09 100755
--- a/heartbeat/CTDB.in
+++ b/heartbeat/CTDB.in
@@ -580,7 +580,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}' | sed "s/\.\?[[:alpha:]].*//")
+	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.16.4

Places

File 0017-CTDB-fix-version-string-with-vendor-trailer-comparis.patch of Package resource-agents.11673

Places