Harden apt-mark defined type

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

diff --git a/manifests/update.pp b/manifests/update.pp
index 0cf83e9e2fc37c51529a4edfe0ad4d76c3f4aa37..256ea7d9bd4265d2d58ba5ea37a6392f23e210df 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,5 +1,9 @@
+# @summary Updates the list of available packages using apt-get update.
+#
+# @api private
+#
 class apt::update {
-  assert_private
+  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
@@ -13,7 +17,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 +32,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,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,
   }
 }