opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #543 from puppetlabs/revert-542-fix_apt_params

Browse source 
Revert "Fix use of $::apt::params::backports and $::apt::params::xfac…
This commit is contained in:
Bryan Jen 2015-06-22 10:27:52 -07:00
commit 5594aa10d2
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manifests/backports.pp
View file

@ -4,7 +4,7 @@ class apt::backports (
$repos = undef, $repos = undef,
$key = undef, $key = undef,
$pin = 200, $pin = 200,
) inherits apt::params { ){
if $location { if $location {
validate_string($location) validate_string($location)
$_location = $location $_location = $location
@ -29,18 +29,18 @@ class apt::backports (
} }
} }
if ($::apt::params::xfacts['lsbdistid'] == 'debian' or $::apt::params::xfacts['lsbdistid'] == 'ubuntu') { if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
unless $location { unless $location {
$_location = $::apt::params::backports['location'] $_location = $::apt::backports['location']
} }
unless $release { unless $release {
$_release = "${::apt::params::xfacts['lsbdistcodename']}-backports" $_release = "${::apt::xfacts['lsbdistcodename']}-backports"
} }
unless $repos { unless $repos {
$_repos = $::apt::params::backports['repos'] $_repos = $::apt::backports['repos']
} }
unless $key { unless $key {
$_key = $::apt::params::backports['key'] $_key = $::apt::backports['key']
} }
} else { } else {
unless $location and $release and $repos and $key { unless $location and $release and $repos and $key {

6
manifests/ppa.pp
View file

@ -2,17 +2,15 @@
define apt::ppa( define apt::ppa(
$ensure = 'present', $ensure = 'present',
$options = $::apt::ppa_options, $options = $::apt::ppa_options,
$release = $::apt::params::xfacts['lsbdistcodename'], $release = $::apt::xfacts['lsbdistcodename'],
$package_name = $::apt::ppa_package, $package_name = $::apt::ppa_package,
$package_manage = false, $package_manage = false,
) { ) {
include 'apt::params'
unless $release { unless $release {
fail('lsbdistcodename fact not available: release parameter required') fail('lsbdistcodename fact not available: release parameter required')
} }
if $::apt::params::xfacts['lsbdistid'] == 'Debian' { if $::apt::xfacts['lsbdistid'] == 'Debian' {
fail('apt::ppa is not currently supported on Debian.') fail('apt::ppa is not currently supported on Debian.')
} }