X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fupdate.pp;h=256ea7d9bd4265d2d58ba5ea37a6392f23e210df;hb=1ca2a1cf1da066d1c284a0c00accc2d31d56b7a3;hp=86f068200c7890d4e59d77ba250ff1cc9096b4bb;hpb=0cbd24a4e59daa7c9e14d35ad7f38e00a93ba1dd;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/update.pp b/manifests/update.pp
index 86f0682..256ea7d 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,10 +58,11 @@ class apt::update {
   }
   exec { 'apt_update':
     command     => "${::apt::provider} update",
+    loglevel    => $::apt::_update['loglevel'],
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
     timeout     => $::apt::_update['timeout'],
     tries       => $::apt::_update['tries'],
-    try_sleep   => 1
+    try_sleep   => 1,
   }
 }