Merge branch 'main' into testing

Use other command in debian
Force installation of drive-utils
2023-11-01 16:31:58 +01:00 · 2023-11-01 16:31:24 +01:00 · 2023-11-01 15:25:31 +01:00 · 2023-11-01 15:20:23 +01:00
1 changed files with 7 additions and 1 deletions
--- a/manifests/script.pp
+++ b/manifests/script.pp
@ -81,8 +81,14 @@ class sunetdrive::script (
    provider => apt,
  }
  $drive_version = '0.3.1'
+  if $facts['os']['name'] == 'Debian' {
+    $pip_cmd = 'pip3 install --break-system-packages'
+  } else {
+    $pip_cmd = 'python3 -m pip install'
+
+  }
  exec { 'drive-utils':
-    command => "python3 -m pip install --break-system-packages https://pypi.sunet.se/packages/drive-utils-${drive_version}.tar.gz",
+    command => "${pip_cmd} https://pypi.sunet.se/packages/drive-utils-${drive_version}.tar.gz",
    unless  => "python3 -m pip list | grep drive-utils | grep ${drive_version}",
    require => Package['python3'],
  }
Author	SHA1	Message	Date
Micke Nordin	2ba33ad5d6	Merge branch 'main' into testing	2023-11-01 16:31:58 +01:00
Micke Nordin	ed65bb0d94	Use other command in debian	2023-11-01 16:31:24 +01:00
Micke Nordin	df731fdb44	Force installation of drive-utils	2023-11-01 15:25:31 +01:00
Micke Nordin	9e4879d9c8	python3.9 -> python3	2023-11-01 15:20:23 +01:00