opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

(#11953) Apt::force passes $version to aptitude

Browse source 
Previously, even if $version were passed to apt::force, aptitude would just
install the default version of the package available. This updates the aptitude
call to use the version string if it exists. If no version is passed, or if it
is false, no version is added to the aptitude call.  This also updates the
rspec-puppet tests for the define, to reflect the changes to the exec.
This commit is contained in:
Matthaus Litteken 2012-01-13 15:29:47 -08:00
parent 30b6748f02
commit f759bc039a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manifests/force.pp
View file

@ -6,7 +6,12 @@ define apt::force(
$version = false
) {
exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
$version_string = $version ? {
false => undef,
default => "=${version}",
}
exec { "/usr/bin/aptitude -y -t ${release} install ${name}${version_string}":
unless => $version ? {
false => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'",
default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'"

3
spec/defines/force_spec.rb
View file

@ -15,7 +15,8 @@ describe 'apt::force', :type => :define do
base_command + (version ? "'Version: #{params[:version]}'" : "'Status: install'")
end
let :exec_title do
"/usr/bin/aptitude -y -t #{params[:release]} install #{title}"
base_exec = "/usr/bin/aptitude -y -t #{params[:release]} install #{title}"
base_exec + (version ? "=#{version}" : "")
end
it { should contain_exec(exec_title).with_unless(unless_query) }
end