Merge pull request #185 from dalen/retry

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 61b9b3a768dacb352e148ca0de0d53225ad85589..784926841a40d6821f36dc728880b8f1bedd75d6 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -28,8 +28,8 @@ define apt::ppa(
   }
 
   if defined(Class[apt]) {
-    $proxy_host = getparam(Class[apt], 'proxy_host')
-    $proxy_port = getparam(Class[apt], 'proxy_port')
+    $proxy_host = $apt::proxy_host
+    $proxy_port = $apt::proxy_port
     case  $proxy_host {
       false, '': {
         $proxy_env = []
@@ -42,7 +42,7 @@ define apt::ppa(
   exec { "add-apt-repository-${name}":
     environment  => $proxy_env,
     command      => "/usr/bin/add-apt-repository ${options} ${name}",
-    creates      => "${sources_list_d}/${sources_list_d_filename}",
+    unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
     logoutput    => 'on_failure',
     notify       => Exec['apt_update'],
     require      => [