X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fkey.pp;h=dbbed2bef0df5e58aea588e1b292d5a1a628359c;hb=2dcec036ca9d7e99dd9f50c4031dafeb86d6b6c2;hp=037eec5288f789937ca492382064715df982034e;hpb=f6e7e0263225e8095d6ca386ad4ea2d77ffe0663;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/key.pp b/manifests/key.pp index 037eec5..dbbed2b 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -46,10 +46,11 @@ define apt::key ( 'server' => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'", } exec { $digest: - path => '/bin:/usr/bin', - unless => "/usr/bin/apt-key list | /bin/grep '${upkey}'", - before => Anchor["apt::key ${upkey} present"], - command => $digest_command, + command => $digest_command, + path => '/bin:/usr/bin', + unless => "/usr/bin/apt-key list | /bin/grep '${upkey}'", + logoutput => 'on_failure', + before => Anchor["apt::key ${upkey} present"], } } @@ -63,11 +64,12 @@ define apt::key ( } exec { "apt::key ${upkey} absent": - path => '/bin:/usr/bin', - onlyif => "apt-key list | grep '${upkey}'", - command => "apt-key del '${upkey}'", - user => 'root', - group => 'root', + command => "apt-key del '${upkey}'", + path => '/bin:/usr/bin', + onlyif => "apt-key list | grep '${upkey}'", + user => 'root', + group => 'root', + logoutput => 'on_failure', } }