add an updates_timeout option to apt::params (PR fix)

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index db312ea13583e2f01e8c8232605d7901fafbba45..61b9b3a768dacb352e148ca0de0d53225ad85589 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,7 +2,7 @@
 
 define apt::ppa(
   $release = $::lsbdistcodename,
-  $options = "-y"
+  $options = '-y'
 ) {
   include apt::params
   include apt::update
@@ -28,27 +28,27 @@ define apt::ppa(
   }
 
   if defined(Class[apt]) {
-    $proxy_host = getparam(Class[apt], "proxy_host")
-    $proxy_port = getparam(Class[apt], "proxy_port")
+    $proxy_host = getparam(Class[apt], 'proxy_host')
+    $proxy_port = getparam(Class[apt], 'proxy_port')
     case  $proxy_host {
-      false: {
-        $proxy_env = ""
+      false, '': {
+        $proxy_env = []
       }
       default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
     }
   } else {
-    $proxy_env = ""
+    $proxy_env = []
   }
   exec { "add-apt-repository-${name}":
     environment  => $proxy_env,
-    command   => "/usr/bin/add-apt-repository ${options} ${name}",
-    creates   => "${sources_list_d}/${sources_list_d_filename}",
-    logoutput => 'on_failure',
-    require   => [
+    command      => "/usr/bin/add-apt-repository ${options} ${name}",
+    creates      => "${sources_list_d}/${sources_list_d_filename}",
+    logoutput    => 'on_failure',
+    notify       => Exec['apt_update'],
+    require      => [
       File[$sources_list_d],
-      Package["${package}"],
+      Package[$package],
     ],
-    notify    => Exec['apt_update'],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":