1 files changed, 20 insertions, 16 deletions
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 99e9c2a..8056286 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,20 +1,24 @@
 define apt::upgrade_package ($version = "") {
 
-  case $version {
-    '': {
-      exec { "aptitude -y install $name":
-        onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-      }
-    }
-    'latest': {
-      exec { "aptitude -y install $name":
-        onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-      }
-    }
-    default: {
-      exec { "aptitude -y install $name=$version":
-        onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-      }
-    }
+  include apt::update
+
+  $version_suffix = $version ? {
+    ''       => '',
+    'latest' => '',
+    default  => "=${version}",
+  }
+
+  package { ['apt-show-versions', 'dctrl-tools']:
+    ensure => installed,
+    require => undef,
   }
+
+  exec { "aptitude -y install ${name}${version_suffix}":
+    onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
+    require => [
+      Exec['apt_updated'],
+      Package['apt-show-versions', 'dctrl-tools'],
+    ],
+  }
+
 }