Skip to content

Commit 8c8e529

Browse files
committed
Remove has_key usage
In the next puppetlabs-stdlib major version this function will be dropped. Native Puppet is used instead. puppetlabs/puppetlabs-stdlib#1319 broke this
1 parent 28b2d0f commit 8c8e529

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

manifests/mod.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
$mod_libs = $apache::mod_libs
5555
if $lib {
5656
$_lib = $lib
57-
} elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
57+
} elsif $mod in $mod_libs { # 2.6 compatibility hack
5858
$_lib = $mod_libs[$mod]
5959
} else {
6060
$_lib = "mod_${mod}.so"
@@ -83,7 +83,7 @@
8383
$mod_packages = $apache::mod_packages
8484
if $package {
8585
$_package = $package
86-
} elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
86+
} elsif $mod in $mod_packages { # 2.6 compatibility hack
8787
$_package = $mod_packages[$mod]
8888
} else {
8989
$_package = undef

manifests/mod/jk.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329

330330
# Ensure that we are not using variables with the typo fixed by MODULES-6225
331331
# anymore:
332-
if !empty($workers_file_content) and has_key($workers_file_content, 'worker_mantain') {
332+
if !empty($workers_file_content) and 'worker_mantain' in $workers_file_content {
333333
fail('Please replace $workers_file_content[\'worker_mantain\'] by $workers_file_content[\'worker_maintain\']. See MODULES-6225 for details.')
334334
}
335335

manifests/mod/php.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
$mod_packages = $apache::mod_packages
8282
if $package_name {
8383
$_package_name = $package_name
84-
} elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
84+
} elsif $mod in $mod_packages { # 2.6 compatibility hack
8585
$_package_name = $mod_packages[$mod]
86-
} elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
86+
} elsif 'phpXXX' in $mod_packages { # 2.6 compatibility hack
8787
$_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
8888
} else {
8989
$_package_name = undef

0 commit comments

Comments
 (0)