From: Hunter Haugen <h.haugen@gmail.com>
Date: Tue, 2 Jul 2013 20:54:12 +0000 (-0700)
Subject: Merge pull request #134 from spali/my_changes
X-Git-Tag: 1.2.0~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9568ecf26d23a2c250c08b735c4b1841c1a1ba01;hp=6f68c5180c385cfb925e6457bec290a6e10849d2;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #134 from spali/my_changes

replace aptitude with apt in apt::force
---

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,
diff --git a/spec/defines/force_spec.rb b/spec/defines/force_spec.rb
index eeea7ff..f5d6ac2 100644
--- a/spec/defines/force_spec.rb
+++ b/spec/defines/force_spec.rb
@@ -32,7 +32,7 @@ describe 'apt::force', :type => :define do
       end
 
       let :exec_title do
-        base_exec = "/usr/bin/aptitude -y -t #{param_hash[:release]} install #{title}"
+        base_exec = "/usr/bin/apt-get -y -t #{param_hash[:release]} install #{title}"
         base_exec + (params[:version] ? "=#{params[:version]}" : "")
       end
       it { should contain_exec(exec_title).with_unless(unless_query) }