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
(MODULES-3581) modulesync [067d08a]
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
setting.pp
diff --git
a/manifests/setting.pp
b/manifests/setting.pp
index ab844602326bc166d1cc6bf934db19905cbea098..b0fb62b1debd8fb5d90c1f86cb0f0bdc5e778a7f 100644
(file)
--- a/
manifests/setting.pp
+++ b/
manifests/setting.pp
@@
-6,6
+6,7
@@
define apt::setting (
$notify_update = true,
) {
$notify_update = true,
) {
+ include 'apt::params'
if $content and $source {
fail('apt::setting cannot have both content and source')
}
if $content and $source {
fail('apt::setting cannot have both content and source')
}
@@
-36,17
+37,17
@@
define apt::setting (
validate_string($content)
}
validate_string($content)
}
- if
$setting_type == 'list'
{
+ if
($setting_type == 'list') or ($setting_type == 'pref')
{
$_priority = ''
} else {
$_priority = $priority
}
$_priority = ''
} else {
$_priority = $priority
}
- $_path = $::apt::config_files[$setting_type]['path']
- $_ext = $::apt::config_files[$setting_type]['ext']
+ $_path = $::apt::
params::
config_files[$setting_type]['path']
+ $_ext = $::apt::
params::
config_files[$setting_type]['ext']
if $notify_update {
if $notify_update {
- $_notify =
Exec['apt_
update']
+ $_notify =
Class['apt::
update']
} else {
$_notify = undef
}
} else {
$_notify = undef
}