fix: remove `apt::` prefix from fact variables

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

diff --git a/manifests/update.pp b/manifests/update.pp
index 4a8a7c8c21be204eb104da03139fbfdf2d89a45e..a9f2486b16bf87e9ad3f1f9143936a8ab45cdee3 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,19 +1,25 @@
+# @summary Updates the list of available packages using apt-get update.
+#
+# @api private
+#
 class apt::update {
-  #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we
+  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
   #with apt and we'd want to know about it.
 
-  case $::apt::_update['frequency'] {
+  case $apt::_update['frequency'] {
     'always': {
       $_kick_apt = true
     }
     'daily': {
       #compare current date with the apt_update_last_success fact to determine
       #if we should kick apt_update.
-      $daily_threshold = (strftime('%s') - 86400)
-      if $::apt_update_last_success {
-        if $::apt_update_last_success + 0 < $daily_threshold {
+      $daily_threshold = (Integer(Timestamp().strftime('%s')) - 86400)
+      if $facts['apt_update_last_success'] {
+        if $facts['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)
-      if $::apt_update_last_success {
-        if ( $::apt_update_last_success + 0 < $weekly_threshold ) {
+      $weekly_threshold = (Integer(Timestamp().strftime('%s')) - 604800)
+      if $facts['apt_update_last_success'] {
+        if $facts['apt_update_last_success'] + 0 < $weekly_threshold {
           $_kick_apt = true
         } else {
           $_kick_apt = false
@@ -51,11 +57,12 @@ class apt::update {
     $_refresh = true
   }
   exec { 'apt_update':
-    command     => "${::apt::provider} 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
+    timeout     => $apt::_update['timeout'],
+    tries       => $apt::_update['tries'],
+    try_sleep   => 1,
   }
 }