Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup apt-module puppet-lint related issues.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 095d8f17b2b86d6318ca3ab24586ad90d314458a..d27aca4442ee8253f19333e79f3449a2876d8b04 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-1,19
+1,21
@@
# ppa.pp
define apt::ppa(
# ppa.pp
define apt::ppa(
- $release = $lsbdistcodename
+ $release = $
::
lsbdistcodename
) {
Class['apt'] -> Apt::Ppa[$title]
include apt::params
) {
Class['apt'] -> Apt::Ppa[$title]
include apt::params
+ $sources_list_d = $apt::params::sources_list_d
+
if ! $release {
fail('lsbdistcodename fact not available: release parameter required')
}
exec { "apt-update-${name}":
if ! $release {
fail('lsbdistcodename fact not available: release parameter required')
}
exec { "apt-update-${name}":
- command =>
'/usr/bin/aptitude update'
,
+ command =>
"${apt::params::provider} update"
,
refreshonly => true,
}
refreshonly => true,
}
@@
-24,13
+26,12
@@
define apt::ppa(
exec { "add-apt-repository-${name}":
command => "/usr/bin/add-apt-repository ${name}",
notify => Exec["apt-update-${name}"],
exec { "add-apt-repository-${name}":
command => "/usr/bin/add-apt-repository ${name}",
notify => Exec["apt-update-${name}"],
- creates => "${
apt::params::
sources_list_d}/${sources_list_d_filename}",
+ creates => "${sources_list_d}/${sources_list_d_filename}",
}
}
- file { "${
apt::params::
sources_list_d}/${sources_list_d_filename}":
+ file { "${sources_list_d}/${sources_list_d_filename}":
ensure => file,
require => Exec["add-apt-repository-${name}"];
}
ensure => file,
require => Exec["add-apt-repository-${name}"];
}
-
}
}