Update manifests/init.pp

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 2821051a9902d4d85e89791e85f2d69bdd781cac..725170d2dc39dfb9c8b51841b795a8d467cb480c 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,20 +1,49 @@
 # ppa.pp
 
 define apt::ppa(
-
+  $release = $::lsbdistcodename
 ) {
-       include apt
+  include apt::params
+  include apt::update
 
-    package { "python-software-properties": }
+  $sources_list_d = $apt::params::sources_list_d
 
-    exec { "apt-update":
-        command     => "/usr/bin/apt-get update",
-        refreshonly => true,
-    }
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
 
-    exec { "/usr/bin/add-apt-repository ${name}":
-        require => Package["python-software-properties"],
-        notify => Exec["apt-update"]
-    }
-}
+  $filename_without_slashes = regsubst($name, '/', '-', G)
+  $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',
+  }
+
+  if ! defined(Package[$package]) {
+    package { $package: }
+  }
 
+  exec { "add-apt-repository-${name}":
+    command   => "/usr/bin/add-apt-repository ${name}",
+    creates   => "${sources_list_d}/${sources_list_d_filename}",
+    logoutput => 'on_failure',
+    require   => [
+      File[$sources_list_d],
+      Package["${package}"],
+    ],
+    notify    => Exec['apt_update'],
+  }
+
+  file { "${sources_list_d}/${sources_list_d_filename}":
+    ensure  => file,
+    require => Exec["add-apt-repository-${name}"],
+  }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::ppa::${name}":
+    require => Class['apt::update'],
+  }
+}