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 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,

diff --git a/spec/defines/force_spec.rb b/spec/defines/force_spec.rb
index eeea7ff094a2c274b68e43923b5818b58bc6d943..f5d6ac22a97db184ed7024ab8a1d2de8636ba11b 100644 (file)
--- 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) }