X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fforce.pp;h=d3d5962d0889a5975c81d62b8acd468015319ea2;hb=14b2eb1ca0ce3886478fcc0b23794237cd387de5;hp=ece532acd0578ac740eba49c324e3b1a559cdbbe;hpb=30b6748f02cac3200ce1ba973ce043d48c7c2283;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/force.pp b/manifests/force.pp index ece532a..d3d5962 100644 --- a/manifests/force.pp +++ b/manifests/force.pp @@ -6,11 +6,17 @@ define apt::force( $version = false ) { - exec { "/usr/bin/aptitude -y -t ${release} install ${name}": - unless => $version ? { - false => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'", - default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'" - } + $version_string = $version ? { + false => undef, + default => "=${version}", } + $install_check = $version ? { + false => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'", + default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'", + } + exec { "/usr/bin/aptitude -y -t ${release} install ${name}${version_string}": + unless => $install_check, + logoutput => 'on_failure', + } }