Skip to content

Commit

Permalink
ensure_packages: switch to stdlib::ensure_packages
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Jun 5, 2023
1 parent 2b9b9da commit c0b8640
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions manifests/init.pp
Expand Up @@ -382,12 +382,12 @@
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
ensure_packages(['gnupg'])
stdlib::ensure_packages(['gnupg'])
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
ensure_packages(['gnupg'])
stdlib::ensure_packages(['gnupg'])
}
}
default: {
Expand Down
4 changes: 2 additions & 2 deletions manifests/key.pp
Expand Up @@ -65,13 +65,13 @@
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
ensure_packages(['gnupg'])
stdlib::ensure_packages(['gnupg'])
Apt::Key<| title == $title |>
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
ensure_packages(['gnupg'])
stdlib::ensure_packages(['gnupg'])
Apt::Key<| title == $title |>
}
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/ppa.pp
Expand Up @@ -73,7 +73,7 @@

if $ensure == 'present' {
if $package_manage {
ensure_packages($package_name)
stdlib::ensure_packages($package_name)
$_require = [File['sources.list.d'], Package[$package_name]]
} else {
$_require = File['sources.list.d']
Expand Down
2 changes: 1 addition & 1 deletion manifests/source.pp
Expand Up @@ -107,7 +107,7 @@
# Newer oses, do not need the package for HTTPS transport.
$_transport_https_releases = ['9']
if (fact('os.release.major') in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ {
ensure_packages('apt-transport-https')
stdlib::ensure_packages('apt-transport-https')
Package['apt-transport-https'] -> Class['apt::update']
}
} else {
Expand Down

0 comments on commit c0b8640

Please sign in to comment.