(#14657) Fix filename when there is a period in the PPA

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index ca7f620956f0adeacc0a84ed3dd4d986d436845d..6b38e52d63164b8249adea6e2b5142829c54050d 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -3,9 +3,6 @@
 define apt::ppa(
   $release = $::lsbdistcodename
 ) {
-
-  Class['apt'] -> Apt::Ppa[$title]
-
   include apt::params
   include apt::update
 
@@ -15,20 +12,31 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  $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"
 
-  $filename_without_slashes = regsubst($name,'/','-','G')
-  $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}",
-    notify  => Exec['apt update'],
+    require => [ File[$sources_list_d],
+                 Package['python-software-properties'] ],
+    notify  => Exec['apt_update'],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":
     ensure  => file,
-    require => Exec["add-apt-repository-${name}"];
+    require => Exec["add-apt-repository-${name}"],
+  }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::ppa::${name}":
+    require => Class['apt::update'],
   }
 }