Update version validation

Fixes voxpupuli#471
krissik · Jul 30, 2020 · 598558b · 598558b
1 parent e87db52
commit 598558b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -29,7 +29,7 @@
 # @example install python3 from scl repo
 #   class { 'python' :
 #     ensure      => 'present',
-#     version     => 'rh-python36-python',
+#     version     => 'rh-python36',
 #     dev         => 'present',
 #     virtualenv  => 'present',
 #   }
@@ -64,7 +64,7 @@
   }
 
   unless $version =~ Pattern[/\A(python)?[0-9](\.[0-9])+/,
-        /\Apypy\Z/, /\Asystem\Z/] {
+        /\Apypy\Z/, /\Asystem\Z/, /\Arh-python[0-9]{2}\Z/] {
     fail("version needs to be pypy, system or a version string like '3.5' or 'python3.5)")
   }
 

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -8,10 +8,11 @@
 
   $python_version = getparam(Class['python'], 'version')
   $python = $python_version ? {
-    'system' => 'python',
-    'pypy'   => 'pypy',
+    'system'                        => 'python',
+    'pypy'                          => 'pypy',
     /\A(python)?([0-9](\.?[0-9])+)/ => "python${2}",
-    default  => "python${python::version}",
+    /\Arh-python[0-9]{2}/           => $python_version,
+    default                         => "python${python::version}",
   }
 
   $pythondev = $facts['os']['family'] ? {