Cleanup apt-module puppet-lint related issues.

This commit is contained in:
Nan Liu 2012-05-03 09:51:14 -07:00
parent 67023aa435
commit 17b9ac3c7f
6 changed files with 11 additions and 11 deletions

View file

@ -22,7 +22,7 @@
#
# Copyright 2011 Puppet Labs Inc, unless otherwise noted.
class apt::backports(
$release = $lsbdistcodename,
$release = $::lsbdistcodename,
$location = $apt::params::backports_location
) inherits apt::params {
@ -31,16 +31,16 @@ class apt::backports(
apt::source { 'backports.list':
location => $location,
release => "${release_real}-backports",
repos => $lsbdistid ? {
repos => $::lsbdistid ? {
'debian' => 'main contrib non-free',
'ubuntu' => 'universe multiverse restricted',
},
key => $lsbdistid ? {
key => $::lsbdistid ? {
'debian' => '55BE302B',
'ubuntu' => '437D05B5',
},
key_server => 'pgp.mit.edu',
pin => '200',
notify => Exec["apt_update"],
notify => Exec['apt_update'],
}
}

View file

@ -10,7 +10,7 @@ define apt::builddep() {
}
exec { "apt-builddep-${name}":
command => "/usr/bin/apt-get -y --force-yes build-dep $name",
notify => Exec["apt-update-${name}"],
command => "/usr/bin/apt-get -y --force-yes build-dep ${name}",
notify => Exec["apt-update-${name}"],
}
}

View file

@ -1,7 +1,7 @@
define apt::conf (
$priority = '50',
$content
) {
) {
include apt::params

View file

@ -42,7 +42,7 @@ class apt(
}
$sources_list_content = $purge_sources_list ? {
false => undef,
false => undef,
true => "# Repos managed by puppet.\n",
}

View file

@ -5,12 +5,12 @@ class apt::params {
$apt_conf_d = "${root}/apt.conf.d"
$preferences_d = "${root}/preferences.d"
case $lsbdistid {
case $::lsbdistid {
'debian': {
$backports_location = 'http://backports.debian.org/debian-backports'
}
'ubuntu': {
case $lsbdistcodename {
case $::lsbdistcodename {
'hardy','lucid','maverick','natty','oneiric','precise': {
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
}

View file

@ -1,7 +1,7 @@
# ppa.pp
define apt::ppa(
$release = $lsbdistcodename
$release = $::lsbdistcodename
) {
Class['apt'] -> Apt::Ppa[$title]