Fixed several lint warnings and errors

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

diff --git a/manifests/force.pp b/manifests/force.pp
index 0a3007d0e534bf69ff84254b5c3c7dde2c2a3d35..2d33e942dcda0a7ddfd564d5d69be95e85a4afb1 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -3,14 +3,22 @@
 
 define apt::force(
   $release = 'testing',
-  $version = false
+  $version = false,
+  $timeout = 300
 ) {
 
-  exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
-    unless => $version ? {
-      false => "/usr/bin/dpkg -l | grep ${name}",
-      default => "/usr/bin/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/apt-get -y -t ${release} install ${name}${version_string}":
+    unless    => $install_check,
+    logoutput => 'on_failure',
+    timeout   => $timeout,
+  }
 }