(#11966) apt module containment for apt_update.

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index c0dfaa0f8212b78f46720540cdebe4240c9d5423..7800d3d388fd9efb714aa98e59df02fae1fb6e8a 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -20,9 +20,14 @@ define apt::ppa(
   $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
   $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
 
+  if ! defined(Package['python-software-properties']) {
+    package { 'python-software-properties': }
+  }
+
   exec { "add-apt-repository-${name}":
     command => "/usr/bin/add-apt-repository ${name}",
     creates => "${sources_list_d}/${sources_list_d_filename}",
+    require => Package['python-software-properties'],
     notify  => Exec['apt_update'],
   }
 
@@ -30,5 +35,10 @@ define apt::ppa(
     ensure  => file,
     require => Exec["add-apt-repository-${name}"];
   }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::ppa::${name}":
+    require => Class['apt::update'],
+  }
 }