Check existence of gpg key in ppa unless

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

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index adce47cae0645fdc4e7ef87ed88740a96bae8c27..a6ef8036d84d2e415588648cae9c6f45838a2c3c 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,10 +1,10 @@
 # ppa.pp
 define apt::ppa(
-  Variant[String, Stdlib::Compat::String] $ensure                 = 'present',
-  Optional[Variant[String, Stdlib::Compat::String]] $options      = $::apt::ppa_options,
-  Optional[Variant[String, Stdlib::Compat::String]] $release      = $facts['lsbdistcodename'],
-  Optional[Variant[String, Stdlib::Compat::String]] $package_name = $::apt::ppa_package,
-  Boolean $package_manage                                         = false,
+  String $ensure                 = 'present',
+  Optional[String] $options      = $::apt::ppa_options,
+  Optional[String] $release      = $facts['lsbdistcodename'],
+  Optional[String] $package_name = $::apt::ppa_package,
+  Boolean $package_manage        = false,
 ) {
   unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
@@ -25,6 +25,10 @@ define apt::ppa(
   $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G')
   $sources_list_d_filename  = "${filename_no_specialchars}.list"
 
+  $name_no_slashes = regsubst($name, '/', '-', 'G')
+  $name_no_specialchars = regsubst($name_no_slashes, '[\.\+]', '_', 'G')
+  $trusted_gpg_d_filename = regsubst($name_no_specialchars, '^ppa:(.+)', "\\1.gpg")
+
   if $ensure == 'present' {
     if $package_manage {
       ensure_packages($package_name)
@@ -47,7 +51,7 @@ define apt::ppa(
     exec { "add-apt-repository-${name}":
       environment => $_proxy_env,
       command     => "/usr/bin/add-apt-repository ${options} ${name}",
-      unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}",
+      unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename} && /usr/bin/test -f ${::apt::trusted_gpg_d}/${trusted_gpg_d_filename}",
       user        => 'root',
       logoutput   => 'on_failure',
       notify      => Class['apt::update'],