From: Tim Meusel Date: Mon, 5 Jun 2023 07:37:05 +0000 (+0200) Subject: ensure_packages: switch to stdlib::ensure_packages X-Git-Tag: v9.1.0~4^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c0b8640fc6a7c3381877863960e02da3fa1fe640;p=puppet-modules%2Fpuppetlabs-apt.git ensure_packages: switch to stdlib::ensure_packages --- diff --git a/manifests/init.pp b/manifests/init.pp index a8b666e..b30b418 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -382,12 +382,12 @@ class apt ( 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: { diff --git a/manifests/key.pp b/manifests/key.pp index f6c2f61..9d3106d 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -65,13 +65,13 @@ define apt::key ( 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 |> } } diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 2a5b4a8..61caa34 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -73,7 +73,7 @@ define apt::ppa ( 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'] diff --git a/manifests/source.pp b/manifests/source.pp index 6d16b5e..2386c0a 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -107,7 +107,7 @@ define apt::source ( # 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 {