X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fupdate.pp;h=1ea16afe039eb815c79a4fba87807d39d25e0f8f;hb=98afb5d41bd3df7c633a55a83355a5d5f33606f2;hp=86f068200c7890d4e59d77ba250ff1cc9096b4bb;hpb=dc746734f17faa996e8441d176143945e8347330;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/update.pp b/manifests/update.pp index 86f0682..1ea16af 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -1,4 +1,10 @@ +# @summary Updates the list of available packages using apt-get update. +# +# @api private +# class apt::update { + assert_private() + #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we #opt to do this, a info/warn would likely be all you'd need likely to happen #on the first run, but if it's not run in awhile something is likely borked @@ -11,9 +17,9 @@ class apt::update { 'daily': { #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. - $daily_threshold = (strftime('%s') - 86400) + $daily_threshold = (Integer(Timestamp().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 @@ -26,9 +32,9 @@ class apt::update { 'weekly':{ #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. - $weekly_threshold = (strftime('%s') - 604800) + $weekly_threshold = (Integer(Timestamp().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 @@ -39,7 +45,7 @@ class apt::update { } } default: { - #catches 'recluctantly', and any other value (which should not occur). + #catches 'reluctantly', and any other value (which should not occur). #do nothing. $_kick_apt = false } @@ -52,6 +58,7 @@ class apt::update { } exec { 'apt_update': command => "${::apt::provider} update", + loglevel => $::apt::_update['loglevel'], logoutput => 'on_failure', refreshonly => $_refresh, timeout => $::apt::_update['timeout'],