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
Merge pull request #63 from rskvazh/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
pin.pp
diff --git
a/manifests/pin.pp
b/manifests/pin.pp
index 58694d68f6089baee4af89afb37ea02950d26628..8e2873a9c042070dce835c30aa69aee094326ef2 100644
(file)
--- a/
manifests/pin.pp
+++ b/
manifests/pin.pp
@@
-2,11
+2,12
@@
# 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 = '',
) {
include apt::params
) {
include apt::params
@@
-17,6
+18,8
@@
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}"
} else {
$pin = "release a=${name}"
}
} else {
$pin = "release a=${name}"
}