X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=5d4c8903d5c6d9968c64e255f63cc61466554326;hb=913a64e1fd9a383cfa39a2bb7487cb2e76d79fa1;hp=4a08dce6fd413134590962f8ad11091b171f5958;hpb=aae853b585329366bf6b3152a7852f2e2fb8b6b4;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 4a08dce..5d4c890 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -1,17 +1,17 @@ # ppa.pp define apt::ppa( $ensure = 'present', - $release = $::lsbdistcodename, $options = $::apt::ppa_options, + $release = $::apt::xfacts['lsbdistcodename'], $package_name = $::apt::ppa_package, $package_manage = false, ) { - if ! $release { + unless $release { fail('lsbdistcodename fact not available: release parameter required') } - if $::operatingsystem != 'Ubuntu' { - fail('apt::ppa is currently supported on Ubuntu only.') + if $::apt::distid != 'ubuntu' { + fail('apt::ppa is currently supported on Ubuntu and LinuxMint only.') } $filename_without_slashes = regsubst($name, '/', '-', 'G') @@ -60,9 +60,4 @@ define apt::ppa( notify => Exec['apt_update'], } } - - # Need anchor to provide containment for dependencies. - anchor { "apt::ppa::${name}": - require => Class['apt::update'], - } }