Merge pull request #720 from actatux/apt-transport-https

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

diff --git a/manifests/update.pp b/manifests/update.pp
index 86f068200c7890d4e59d77ba250ff1cc9096b4bb..4cc6ec523f578c47ea3f3c61e3bacf2f2029395c 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,4 +1,6 @@
 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
@@ -13,7 +15,7 @@ class apt::update {
       #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
@@ -28,7 +30,7 @@ class apt::update {
       #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
@@ -39,7 +41,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 +54,7 @@ class apt::update {
   }
   exec { 'apt_update':
     command     => "${::apt::provider} update",
+    loglevel    => $::apt::_update['loglevel'],
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
     timeout     => $::apt::_update['timeout'],