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 a41c814f296e4a4f4c8f4462208ec3242e345a69..d27aca4442ee8253f19333e79f3449a2876d8b04 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-1,21
+1,37
@@
# ppa.pp
# ppa.pp
-define apt::ppa() {
+define apt::ppa(
+ $release = $::lsbdistcodename
+) {
Class['apt'] -> Apt::Ppa[$title]
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}":
exec { "apt-update-${name}":
- command => "
/usr/bin/aptitude
update",
+ command => "
${apt::params::provider}
update",
refreshonly => true,
}
refreshonly => true,
}
+ $filename_without_slashes = regsubst($name,'/','-','G')
+ $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
+ $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+
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}"],
- unless => $name? {
- /ppa:(.*)/ => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*ppa.*$1.*$'",
- default => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*${title}.*$'",
- }
+ creates => "${sources_list_d}/${sources_list_d_filename}",
+ }
+
+ file { "${sources_list_d}/${sources_list_d_filename}":
+ ensure => file,
+ require => Exec["add-apt-repository-${name}"];
}
}
}
}