X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fforce.pp;h=d3d5962d0889a5975c81d62b8acd468015319ea2;hb=14b2eb1ca0ce3886478fcc0b23794237cd387de5;hp=e56246bfdfaf59d53608fa37b64864c3268eb4aa;hpb=f848bac6072f99e1cd60a0cc0b84e5679c598dab;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/force.pp b/manifests/force.pp
index e56246b..d3d5962 100644
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -2,15 +2,21 @@
 # force a package from a specific release
 
 define apt::force(
-	$release = 'testing',
-	$version = false
+  $release = 'testing',
+  $version = false
 ) {
-	
-	exec { "aptitude -y -t ${release} install ${name}":
-		unless => $version ? {
-			false => "dpkg -l | grep ${name}",
-			default => "dpkg -l | grep ${name} | grep ${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',
+  }
 }