From c3799c18190a37e44b3558b4b0eccd2d2e9e459c Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Wed, 8 Feb 2023 17:42:37 -0800 Subject: [PATCH 1/5] fix: make version compare not fail on sid --- modules/ocf/manifests/packages/mysql_server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/packages/mysql_server.pp b/modules/ocf/manifests/packages/mysql_server.pp index 260240e38..98ecbea38 100644 --- a/modules/ocf/manifests/packages/mysql_server.pp +++ b/modules/ocf/manifests/packages/mysql_server.pp @@ -10,7 +10,7 @@ } if $manage_service { - if Integer($::os[release][major]) < 11 { + if $::os[release][major] !~ /\d+/ && Integer($::os[release][major]) < 11 { $servicename = 'mysql' } else { $servicename = 'mariadb' From bbd257a29a5b5a6fa6ee83a294333b97d49714a1 Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Wed, 8 Feb 2023 17:45:33 -0800 Subject: [PATCH 2/5] fix: syntax --- modules/ocf/manifests/packages/mysql_server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/packages/mysql_server.pp b/modules/ocf/manifests/packages/mysql_server.pp index 98ecbea38..9dd8a0e45 100644 --- a/modules/ocf/manifests/packages/mysql_server.pp +++ b/modules/ocf/manifests/packages/mysql_server.pp @@ -10,7 +10,7 @@ } if $manage_service { - if $::os[release][major] !~ /\d+/ && Integer($::os[release][major]) < 11 { + if $::os[release][major] !~ /\d+/ and Integer($::os[release][major]) < 11 { $servicename = 'mysql' } else { $servicename = 'mariadb' From 52dc036a25f059bdc6cce485560ac95cf03620f5 Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Wed, 8 Feb 2023 17:50:18 -0800 Subject: [PATCH 3/5] fix. --- modules/ocf/manifests/packages/mysql_server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/packages/mysql_server.pp b/modules/ocf/manifests/packages/mysql_server.pp index 9dd8a0e45..6f6481647 100644 --- a/modules/ocf/manifests/packages/mysql_server.pp +++ b/modules/ocf/manifests/packages/mysql_server.pp @@ -10,7 +10,7 @@ } if $manage_service { - if $::os[release][major] !~ /\d+/ and Integer($::os[release][major]) < 11 { + if $::os[release][major] =~ /\d+/ and Integer($::os[release][major]) < 11 { $servicename = 'mysql' } else { $servicename = 'mariadb' From 535ff4236191561595eccfdb8b73639c3b7bf346 Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Wed, 8 Feb 2023 17:54:23 -0800 Subject: [PATCH 4/5] fix: extrapackages.pp --- modules/ocf/manifests/extrapackages.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/extrapackages.pp b/modules/ocf/manifests/extrapackages.pp index baa70a2ac..167bb90c6 100644 --- a/modules/ocf/manifests/extrapackages.pp +++ b/modules/ocf/manifests/extrapackages.pp @@ -194,7 +194,7 @@ ]:; } - if Integer($::os['distro']['release']['major']) >= 11 { + if $::os[release][major] =~ /\d+/ and Integer($::os['distro']['release']['major']) >= 11 { package { [ 'bat', From 20818a4555568069cc43b6bd6fa1020c6b3331f8 Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Wed, 8 Feb 2023 23:08:43 -0800 Subject: [PATCH 5/5] fix: inverted comparison? --- modules/ocf/manifests/extrapackages.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/extrapackages.pp b/modules/ocf/manifests/extrapackages.pp index 167bb90c6..db250c33f 100644 --- a/modules/ocf/manifests/extrapackages.pp +++ b/modules/ocf/manifests/extrapackages.pp @@ -194,7 +194,7 @@ ]:; } - if $::os[release][major] =~ /\d+/ and Integer($::os['distro']['release']['major']) >= 11 { + if $::os[release][major] !~ /\d+/ or Integer($::os['distro']['release']['major']) >= 11 { package { [ 'bat',