Merge pull request #410 from fklajn-opera/fix_version_inconsistency

wyardley · web-flow · commit c556f13b8fd2 · 2018-06-16T07:51:27.000-07:00
Fix Python version regex in install.pp
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -215,7 +215,7 @@
         }
       }
 
-      if "${::python::version}" =~ /^3/ { #lint:ignore:only_variable_string
+      if "${::python::version}" =~ /^python3/ { #lint:ignore:only_variable_string
         $pip_category = undef
         $pip_package = 'python3-pip'
       } elsif ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemmajrelease, '7') >= 0) {

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- if "${::python::version}" =~ /^3/ { #lint:ignore:only_variable_string`
	`218`	`+ if "${::python::version}" =~ /^python3/ { #lint:ignore:only_variable_string`
`219`	`219`	`$pip_category = undef`
`220`	`220`	`$pip_package = 'python3-pip'`
`221`	`221`	`} elsif ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemmajrelease, '7') >= 0) {`