Merge branch 'master' into my_changes

diff --git a/manifests/force.pp b/manifests/force.pp
index 75634b476dd8fe7cac2517cbdbefcc89b758dc13..2d33e942dcda0a7ddfd564d5d69be95e85a4afb1 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -16,7 +16,7 @@ define apt::force(
     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}":
+  exec { "/usr/bin/apt-get -y -t ${release} install ${name}${version_string}":
     unless    => $install_check,
     logoutput => 'on_failure',
     timeout   => $timeout,