From: Benjamin Knofe <ben@nerdlabor.de>
Date: Sat, 29 Jun 2013 11:06:26 +0000 (+0200)
Subject: apt::key: trim keys to 8 chars to match with apt-key list, refs puppetlabs/puppetlabs... 
X-Git-Tag: 1.1.1~4^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=733ece66e7b702097642309b14e047fa45dff7e2;p=puppet-modules%2Fpuppetlabs-apt.git

apt::key: trim keys to 8 chars to match with apt-key list, refs puppetlabs/puppetlabs-apt#100
---

diff --git a/manifests/key.pp b/manifests/key.pp
index 98a0f3a..b14500e 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -9,6 +9,8 @@ define apt::key (
   include apt::params
 
   $upkey = upcase($key)
+  # trim the key to the last 8 chars so we can match longer keys with apt-key list too
+  $trimmedkey = regsubst($upkey, '^.*(.{8})$', '\1')
 
   if $key_content {
     $method = 'content'
@@ -48,7 +50,7 @@ define apt::key (
         exec { $digest:
           command   => $digest_command,
           path      => '/bin:/usr/bin',
-          unless    => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
+          unless    => "/usr/bin/apt-key list | /bin/grep '${trimmedkey}'",
           logoutput => 'on_failure',
           before    => Anchor["apt::key ${upkey} present"],
         }
@@ -66,7 +68,7 @@ define apt::key (
       exec { "apt::key ${upkey} absent":
         command   => "apt-key del '${upkey}'",
         path      => '/bin:/usr/bin',
-        onlyif    => "apt-key list | grep '${upkey}'",
+        onlyif    => "apt-key list | grep '${trimmedkey}'",
         user      => 'root',
         group     => 'root',
         logoutput => 'on_failure',