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 0458589849e30ec90dcc8f7a7d6f0d73ef6f3c32..7cb88c8cd5a32ec8b591e6abb1f7bac03fef68df 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,7 +1,8 @@
 # ppa.pp
 
 define apt::ppa(
-  $release = $::lsbdistcodename
+  $release = $::lsbdistcodename,
+  $options = '-y'
 ) {
   include apt::params
   include apt::update
@@ -12,24 +13,42 @@ 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)
+  $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"
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
+  $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}",
-    logoutput => 'on_failure',
-    require   => [
+    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['python-software-properties'],
+      Package[$package],
     ],
-    notify    => Exec['apt_update'],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":
@@ -42,4 +61,3 @@ define apt::ppa(
     require => Class['apt::update'],
   }
 }
-