diff --git a/manifests/force.pp b/manifests/force.pp index 75634b476d..2d33e942dc 100644 --- a/manifests/force.pp +++ b/manifests/force.pp @@ -16,7 +16,7 @@ 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 eeea7ff094..f5d6ac22a9 100644 --- a/spec/defines/force_spec.rb +++ b/spec/defines/force_spec.rb @@ -32,7 +32,7 @@ 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) }