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
Allow user to modify loglevel of apt-get update Exec resource so that its
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
update.pp
diff --git
a/manifests/update.pp
b/manifests/update.pp
index 86f068200c7890d4e59d77ba250ff1cc9096b4bb..461e8c14e1768927b838d0a715766d08809f8e37 100644
(file)
--- a/
manifests/update.pp
+++ b/
manifests/update.pp
@@
-13,7
+13,7
@@
class apt::update {
#if we should kick apt_update.
$daily_threshold = (strftime('%s') - 86400)
if $::apt_update_last_success {
#if we should kick apt_update.
$daily_threshold = (strftime('%s') - 86400)
if $::apt_update_last_success {
- if $::apt_update_last_success < $daily_threshold {
+ if $::apt_update_last_success
+ 0
< $daily_threshold {
$_kick_apt = true
} else {
$_kick_apt = false
$_kick_apt = true
} else {
$_kick_apt = false
@@
-28,7
+28,7
@@
class apt::update {
#if we should kick apt_update.
$weekly_threshold = (strftime('%s') - 604800)
if $::apt_update_last_success {
#if we should kick apt_update.
$weekly_threshold = (strftime('%s') - 604800)
if $::apt_update_last_success {
- if ( $::apt_update_last_success < $weekly_threshold ) {
+ if ( $::apt_update_last_success
+ 0
< $weekly_threshold ) {
$_kick_apt = true
} else {
$_kick_apt = false
$_kick_apt = true
} else {
$_kick_apt = false
@@
-39,7
+39,7
@@
class apt::update {
}
}
default: {
}
}
default: {
- #catches 're
c
luctantly', and any other value (which should not occur).
+ #catches 'reluctantly', and any other value (which should not occur).
#do nothing.
$_kick_apt = false
}
#do nothing.
$_kick_apt = false
}
@@
-52,6
+52,7
@@
class apt::update {
}
exec { 'apt_update':
command => "${::apt::provider} update",
}
exec { 'apt_update':
command => "${::apt::provider} update",
+ loglevel => $::apt::_update['loglevel'],
logoutput => 'on_failure',
refreshonly => $_refresh,
timeout => $::apt::_update['timeout'],
logoutput => 'on_failure',
refreshonly => $_refresh,
timeout => $::apt::_update['timeout'],