Skip to content

Remove has_key usage #2408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Remove has_key usage #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/mod.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
$mod_libs = $apache::mod_libs
if $lib {
$_lib = $lib
} elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack
} elsif $mod in $mod_libs { # 2.6 compatibility hack
$_lib = $mod_libs[$mod]
} else {
$_lib = "mod_${mod}.so"
Expand Down Expand Up @@ -83,7 +83,7 @@
$mod_packages = $apache::mod_packages
if $package {
$_package = $package
} elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
} elsif $mod in $mod_packages { # 2.6 compatibility hack
$_package = $mod_packages[$mod]
} else {
$_package = undef
Expand Down
2 changes: 1 addition & 1 deletion manifests/mod/jk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@

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

Expand Down
4 changes: 2 additions & 2 deletions manifests/mod/php.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
$mod_packages = $apache::mod_packages
if $package_name {
$_package_name = $package_name
} elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
} elsif $mod in $mod_packages { # 2.6 compatibility hack
$_package_name = $mod_packages[$mod]
} elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
} elsif 'phpXXX' in $mod_packages { # 2.6 compatibility hack
$_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
} else {
$_package_name = undef
Expand Down