ppa: fix empty environment definition in exec ressource when no proxy

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 9ac4d03ceee6d6250c31766caf5b72d3890e75f2..6cb921f19bec95951ff52a554b0f8cb096f4ed39 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -16,17 +16,30 @@ define apt::ppa(
   $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',
+    /^[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}":
+    environment  => $proxy_env,
     command   => "/usr/bin/add-apt-repository ${name}",
     creates   => "${sources_list_d}/${sources_list_d_filename}",
     logoutput => 'on_failure',