Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Separate apt::pin for apt::backports to allow pin by release instead of origin
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
backports.pp
diff --git
a/manifests/backports.pp
b/manifests/backports.pp
index eafa50692e54bf22ee229baca975ccf4bc282a6a..a3ddb76e0078339b2721498f181866220cf1f6c9 100644
(file)
--- a/
manifests/backports.pp
+++ b/
manifests/backports.pp
@@
-38,22
+38,45
@@
class apt::backports(
fail('$pin_priority must be an integer')
}
fail('$pin_priority must be an integer')
}
- $release_real = downcase($release)
- $key = $::lsbdistid ? {
+ if $::lsbdistid == 'LinuxMint' {
+ if $::lsbdistcodename == 'debian' {
+ $distid = 'debian'
+ $release_real = 'wheezy'
+ } else {
+ $distid = 'ubuntu'
+ $release_real = $::lsbdistcodename ? {
+ 'qiana' => 'trusty',
+ 'petra' => 'saucy',
+ 'olivia' => 'raring',
+ 'nadia' => 'quantal',
+ 'maya' => 'precise',
+ }
+ }
+ } else {
+ $distid = $::lsbdistid
+ $release_real = downcase($release)
+ }
+
+ $key = $distid ? {
'debian' => '46925553',
'ubuntu' => '437D05B5',
}
'debian' => '46925553',
'ubuntu' => '437D05B5',
}
- $repos = $
::lsb
distid ? {
+ $repos = $distid ? {
'debian' => 'main contrib non-free',
'ubuntu' => 'main universe multiverse restricted',
}
'debian' => 'main contrib non-free',
'ubuntu' => 'main universe multiverse restricted',
}
+ apt::pin { 'backports':
+ before => Apt::Source['backports'],
+ release => "${release_real}-backports",
+ priority => $pin_priority,
+ }
+
apt::source { 'backports':
location => $location,
release => "${release_real}-backports",
repos => $repos,
key => $key,
key_server => 'pgp.mit.edu',
apt::source { 'backports':
location => $location,
release => "${release_real}-backports",
repos => $repos,
key => $key,
key_server => 'pgp.mit.edu',
- pin => $pin_priority,
}
}
}
}