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
(#16075) Allow pinning on version numbers
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
pin.pp
diff --git
a/manifests/pin.pp
b/manifests/pin.pp
index 2664c9ba6a40199fde9203b6d99b07a3cf1a8615..a69df2a695e934bb601cb0b9fbc3f2d52941144c 100644
(file)
--- a/
manifests/pin.pp
+++ b/
manifests/pin.pp
@@
-2,11
+2,13
@@
# pin a release in apt, useful for unstable repositories
define apt::pin(
# pin a release in apt, useful for unstable repositories
define apt::pin(
- $ensure = present,
- $packages = '*',
- $priority = 0,
- $release = '',
- $origin = ''
+ $ensure = present,
+ $packages = '*',
+ $priority = 0,
+ $release = '',
+ $origin = '',
+ $originator = '',
+ $version = ''
) {
include apt::params
) {
include apt::params
@@
-17,16
+19,20
@@
define apt::pin(
$pin = "release a=${release}"
} elsif $origin != '' {
$pin = "origin \"${origin}\""
$pin = "release a=${release}"
} elsif $origin != '' {
$pin = "origin \"${origin}\""
+ } elsif $originator != '' {
+ $pin = "release o=${originator}"
+ } elsif $version != '' {
+ $pin = "version ${version}"
} else {
} else {
- err("Apt::Pin needs either $release or $origin")
+ $pin = "release a=${name}"
}
file { "${name}.pref":
ensure => $ensure,
}
file { "${name}.pref":
ensure => $ensure,
- path => "${preferences_d}/${name}",
+ path => "${preferences_d}/${name}
.pref
",
owner => root,
group => root,
mode => '0644',
owner => root,
group => root,
mode => '0644',
- content =>
"# ${name}\nPackage: ${packages}\nPin: ${pin}\nPin-Priority: ${priority}"
,
+ content =>
template("apt/pin.pref.erb")
,
}
}
}
}