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

MODULES-2446 - Fix pinning for backports

Browse source 
The 2.x series added a changed behavior for backport pinning to pin to
origin instead of release. Pinning to release is the correct behavior
for backports though.
This commit is contained in:
Morgan Haskel 2015-08-26 16:29:54 -07:00
parent 3df188f879
commit 9f43b2db26
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
manifests/backports.pp
View file

@ -23,12 +23,6 @@ class apt::backports (
} }
$_key = $key $_key = $key
} }
unless is_hash($pin) {
unless (is_numeric($pin) or is_string($pin)) {
fail('pin must be either a string, number or hash')
}
}
if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') { if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
unless $location { unless $location {
$_location = $::apt::backports['location'] $_location = $::apt::backports['location']
@ -48,12 +42,24 @@ class apt::backports (
} }
} }
if is_hash($pin) {
$_pin = $pin
} elsif is_numeric($pin) or is_string($pin) {
# apt::source defaults to pinning to origin, but we should pin to release
# for backports
$_pin = {
'priority' => $pin,
'release' => $_release,
}
} else {
fail('pin must be either a string, number or hash')
}
apt::source { 'backports': apt::source { 'backports':
location => $_location, location => $_location,
release => $_release, release => $_release,
repos => $_repos, repos => $_repos,
key => $_key, key => $_key,
pin => $pin, pin => $_pin,
} }
} }

10
spec/classes/apt_backports_spec.rb
View file

@ -18,7 +18,7 @@ describe 'apt::backports', :type => :class do
:key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
:repos => 'main contrib non-free', :repos => 'main contrib non-free',
:release => 'wheezy-backports', :release => 'wheezy-backports',
:pin => 200, :pin => { 'priority' => 200, 'release' => 'wheezy-backports' },
}) })
} }
end end
@ -36,7 +36,7 @@ describe 'apt::backports', :type => :class do
:key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
:repos => 'main contrib non-free', :repos => 'main contrib non-free',
:release => 'squeeze-backports', :release => 'squeeze-backports',
:pin => 200, :pin => { 'priority' => 200, 'release' => 'squeeze-backports' },
}) })
} }
end end
@ -54,7 +54,7 @@ describe 'apt::backports', :type => :class do
:key => '630239CC130E1A7FD81A27B140976EAF437D05B5', :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
:repos => 'main universe multiverse restricted', :repos => 'main universe multiverse restricted',
:release => 'trusty-backports', :release => 'trusty-backports',
:pin => 200, :pin => { 'priority' => 200, 'release' => 'trusty-backports' },
}) })
} }
end end
@ -81,7 +81,7 @@ describe 'apt::backports', :type => :class do
:key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
:repos => 'main', :repos => 'main',
:release => 'vivid', :release => 'vivid',
:pin => 90, :pin => { 'priority' => 90, 'release' => 'vivid' },
}) })
} }
end end
@ -134,7 +134,7 @@ describe 'apt::backports', :type => :class do
:key => '630239CC130E1A7FD81A27B140976EAF437D05B5', :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
:repos => 'main universe multiverse restricted', :repos => 'main universe multiverse restricted',
:release => 'trusty-backports', :release => 'trusty-backports',
:pin => 200, :pin => { 'priority' => 200, 'release' => 'trusty-backports' },
}) })
} }
end end