Regex fix (#292)

davejrt · MarkW · commit 9a6bdaaa41d1 · 2018-07-24T01:19:49.000+01:00
* fixes issue #255 * whitespace
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -569,8 +569,8 @@
     }
   }
 
-  if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~|-|\.)ce|1.\d+)/ ) {
-    if ( $docker_ee) {
+if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.][0-1](~|-|\.)ce|1.\d+)/ ) {
+  if ( $docker_ee) {
       $package_location = $docker::docker_ee_source_location
       $package_key_source = $docker::docker_ee_key_source
       $package_key_check_source = true

Original file line number	Diff line number	Diff line change
`@@ -569,8 +569,8 @@`
`569`	`569`	`}`
`570`	`570`	`}`
`571`	`571`
`572`		`- if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~\|-\|\.)ce\|1.\d+)/ ) {`
`573`		`- if ( $docker_ee) {`
	`572`	`+if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.][0-1](~\|-\|\.)ce\|1.\d+)/ ) {`
	`573`	`+ if ( $docker_ee) {`
`574`	`574`	`$package_location = $docker::docker_ee_source_location`
`575`	`575`	`$package_key_source = $docker::docker_ee_key_source`
`576`	`576`	`$package_key_check_source = true`