X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=d27aca4442ee8253f19333e79f3449a2876d8b04;hb=17b9ac3c7f0aaf7322eae634fb0f35eb27bf872c;hp=dd2143e246aea2e35e46bf69ba2004b29a9bec20;hpb=18f614b89be97040815f46ba95677b4d69ed305f;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index dd2143e..d27aca4 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,17 +1,37 @@
 # ppa.pp
 
-define apt::ppa() {
+define apt::ppa(
+  $release = $::lsbdistcodename
+) {
 
   Class['apt'] -> Apt::Ppa[$title]
 
-    exec { "apt-update-${name}":
-        command     => "/usr/bin/aptitude update",
-        refreshonly => true,
-    }
+  include apt::params
 
-    exec { "add-apt-repository-${name}":
-        command => "/usr/bin/add-apt-repository ${name}",
-        notify  => Exec["apt-update-${name}"],
-    }
+  $sources_list_d = $apt::params::sources_list_d
+
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
+
+  exec { "apt-update-${name}":
+    command     => "${apt::params::provider} update",
+    refreshonly => true,
+  }
+
+  $filename_without_slashes = regsubst($name,'/','-','G')
+  $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
+  $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+
+  exec { "add-apt-repository-${name}":
+    command => "/usr/bin/add-apt-repository ${name}",
+    notify  => Exec["apt-update-${name}"],
+    creates => "${sources_list_d}/${sources_list_d_filename}",
+  }
+
+  file { "${sources_list_d}/${sources_list_d_filename}":
+    ensure  => file,
+    require => Exec["add-apt-repository-${name}"];
+  }
 }