From a17a610a7ae8dee3357ff048052764cb3620823a Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Tue, 13 Feb 2024 10:37:46 -0930 Subject: [PATCH 1/3] freebsd python packages do not have a period between major and minor versions. eg: py39-pip. --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index c3db3d80..7a2bdd29 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -222,7 +222,7 @@ $pip_package = 'python2-pip' $pip_provider = pip2 } elsif $facts['os']['family'] == 'FreeBSD' { - $pip_package = "py${python::version}-pip" + $pip_package = sprintf( "py%s-pip", regsubst($python::version, '([0-9])\\.([0-9]+)', '\\1\\2') ) $pip_provider = 'pip' } elsif $facts['os']['family'] == 'Gentoo' { $pip_package = 'dev-python/pip' From 7e2758e3883b4ddb1f9ebdaa7b45946127d388ce Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Tue, 13 Feb 2024 11:11:55 -0930 Subject: [PATCH 2/3] there is no package for venv on freebsd, only a port. --- manifests/params.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/params.pp b/manifests/params.pp index 49bfdeac..6fdac7f7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -40,6 +40,7 @@ } $manage_venv_package = $facts['os']['family'] ? { 'Archlinux' => false, + 'FreeBSD' => false, default => true, } } From 931bd693fa43aa481647a6326e67761090ff4206 Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Tue, 13 Feb 2024 12:22:24 -0930 Subject: [PATCH 3/3] fix double quoted string containing no variables. --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 7a2bdd29..78bbf9c7 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -222,7 +222,7 @@ $pip_package = 'python2-pip' $pip_provider = pip2 } elsif $facts['os']['family'] == 'FreeBSD' { - $pip_package = sprintf( "py%s-pip", regsubst($python::version, '([0-9])\\.([0-9]+)', '\\1\\2') ) + $pip_package = sprintf( 'py%s-pip', regsubst($python::version, '([0-9])\\.([0-9]+)', '\\1\\2') ) $pip_provider = 'pip' } elsif $facts['os']['family'] == 'Gentoo' { $pip_package = 'dev-python/pip'