From: Thomas Spalinger <spali@github.com>
Date: Tue, 25 Jun 2013 20:53:14 +0000 (+0200)
Subject: Merge branch 'master' into my_changes
X-Git-Tag: 1.2.0~2^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ca810b37c67eae10995df645327699d2fea4b3ef;hp=18ee4cc6c9eb8d16becfec68254d8955eb10c7d5;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'master' into my_changes
---

diff --git a/manifests/force.pp b/manifests/force.pp
index 75634b4..2d33e94 100644
--- 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,