Merge pull request #49 from nanliu/tb/11966

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 75f0a69574368316f4540567d00b92383645391b..c0dfaa0f8212b78f46720540cdebe4240c9d5423 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,13 +1,34 @@
 # ppa.pp
 
 define apt::ppa(
-       
+  $release = $::lsbdistcodename
 ) {
-       include apt
-       
-       exec { "/usr/bin/add-apt-repository ${name}":
-               require => Package["python-software-properties"],
-               # TODO: unless => 'check'
-       }
+
+  Class['apt'] -> Apt::Ppa[$title]
+
+  include apt::params
+  include apt::update
+
+  $sources_list_d = $apt::params::sources_list_d
+
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
+
+
+  $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}",
+    creates => "${sources_list_d}/${sources_list_d_filename}",
+    notify  => Exec['apt_update'],
+  }
+
+  file { "${sources_list_d}/${sources_list_d_filename}":
+    ensure  => file,
+    require => Exec["add-apt-repository-${name}"];
+  }
 }