Merge pull request #782 from puppetlabs/pdksync_1.7.0-0-g57412ed

[puppet-modules/puppetlabs-apt.git] / manifests / update.pp

diff --git a/manifests/update.pp b/manifests/update.pp
index 44f6c6e301ca37f4d48ca4357a2301928db5cc79..4b05c21e069061c297bb79b1cbf8d8ecbce72a99 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,3 +1,4 @@
+# Defining apt update
 class apt::update {
   assert_private()
 
@@ -13,7 +14,7 @@ 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 + 0 < $daily_threshold {
           $_kick_apt = true
@@ -28,7 +29,7 @@ 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 + 0 < $weekly_threshold ) {
           $_kick_apt = true
@@ -54,6 +55,7 @@ class apt::update {
   }
   exec { 'apt_update':
     command     => "${::apt::provider} update",
+    loglevel    => $::apt::_update['loglevel'],
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
     timeout     => $::apt::_update['timeout'],