# ppa.pp
-define apt::ppa() {
+define apt::ppa(
+ $release = $::lsbdistcodename
+) {
+ include apt::params
+ include apt::update
- Class['apt'] -> Apt::Ppa[$title]
+ $sources_list_d = $apt::params::sources_list_d
- Exec {
- onlyif => "/usr/bin/test ! $(/bin/ls /etc/apt/sources.list.d | /bin/grep -v $(echo \"${title}\" | /usr/bin/gawk 'match(\$0, /^ppa:(.*)\/(.*)$/, vals) {printf \"%s-%s\", vals[1], vals[2]}'))",
+ if ! $release {
+ fail('lsbdistcodename fact not available: release parameter required')
}
- exec { "apt-update-${name}":
- command => "/usr/bin/aptitude update",
- refreshonly => true,
+ $filename_without_slashes = regsubst($name, '/', '-', G)
+ $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', G)
+ $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', G)
+ $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+
+ $package = $::lsbdistrelease ? {
+ /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
+ default => 'software-properties-common',
+ }
+
+ if ! defined(Package[$package]) {
+ package { $package: }
}
+ if defined(Class[apt]) {
+ $proxy_host = getparam(Class[apt], "proxy_host")
+ $proxy_port = getparam(Class[apt], "proxy_port")
+ case $proxy_host {
+ false, "": {
+ $proxy_env = []
+ }
+ default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+ }
+ } else {
+ $proxy_env = []
+ }
exec { "add-apt-repository-${name}":
- command => "/usr/bin/add-apt-repository ${name}",
- notify => Exec["apt-update-${name}"],
+ environment => $proxy_env,
+ command => "/usr/bin/add-apt-repository ${name}",
+ creates => "${sources_list_d}/${sources_list_d_filename}",
+ logoutput => 'on_failure',
+ require => [
+ File[$sources_list_d],
+ Package["${package}"],
+ ],
+ notify => Exec['apt_update'],
}
-}
+ file { "${sources_list_d}/${sources_list_d_filename}":
+ ensure => file,
+ require => Exec["add-apt-repository-${name}"],
+ }
+
+ # Need anchor to provide containment for dependencies.
+ anchor { "apt::ppa::${name}":
+ require => Class['apt::update'],
+ }
+}