This work flips from onlyif to unless (mistakenly looked at the

[puppet-modules/puppetlabs-apt.git] / manifests / ppa.pp

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index ca7f620956f0adeacc0a84ed3dd4d986d436845d..7cb88c8cd5a32ec8b591e6abb1f7bac03fef68df 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,11 +1,9 @@
 # ppa.pp
 
 define apt::ppa(
-  $release = $::lsbdistcodename
+  $release = $::lsbdistcodename,
+  $options = '-y'
 ) {
-
-  Class['apt'] -> Apt::Ppa[$title]
-
   include apt::params
   include apt::update
 
@@ -15,20 +13,51 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  $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"
 
-  $filename_without_slashes = regsubst($name,'/','-','G')
-  $filename_without_ppa = regsubst($filename_without_slashes, '^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}",
-    creates => "${sources_list_d}/${sources_list_d_filename}",
-    notify  => Exec['apt update'],
+    environment  => $proxy_env,
+    command      => "/usr/bin/add-apt-repository ${options} ${name}",
+    unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
+    logoutput    => 'on_failure',
+    notify       => Exec['apt_update'],
+    require      => [
+      File[$sources_list_d],
+      Package[$package],
+    ],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":
     ensure  => file,
-    require => Exec["add-apt-repository-${name}"];
+    require => Exec["add-apt-repository-${name}"],
   }
-}
 
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::ppa::${name}":
+    require => Class['apt::update'],
+  }
+}