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

Merge pull request #542 from infopro-digital/fix_apt_params

Browse source 
Fix use of $::apt::params::backports and $::apt::params::xfacts.
This commit is contained in:
JT (Jonny) 2015-06-22 16:00:39 +01:00
commit 8f5cb7341a
2 changed files with 10 additions and 8 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,
$key = undef,
$pin = 200,
){
) inherits apt::params {
if $location {
validate_string($location)
$_location = $location
@ -29,18 +29,18 @@ class apt::backports (
}
}
if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
if ($::apt::params::xfacts['lsbdistid'] == 'debian' or $::apt::params::xfacts['lsbdistid'] == 'ubuntu') {
unless $location {
$_location = $::apt::backports['location']
$_location = $::apt::params::backports['location']
}
unless $release {
$_release = "${::apt::xfacts['lsbdistcodename']}-backports"
$_release = "${::apt::params::xfacts['lsbdistcodename']}-backports"
}
unless $repos {
$_repos = $::apt::backports['repos']
$_repos = $::apt::params::backports['repos']
}
unless $key {
$_key = $::apt::backports['key']
$_key = $::apt::params::backports['key']
}
} else {
unless $location and $release and $repos and $key {

6
manifests/ppa.pp
View file

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