From: Romain Tartière <romain@blogreen.org>
Date: Fri, 26 Jan 2018 15:18:47 +0000 (+0100)
Subject: Do not rely on deprecated argument signature
X-Git-Tag: 5.0.0~16^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4f11ef21996695958c76de9fda0b8c8117e85f65;p=puppet-modules%2Fpuppetlabs-apt.git

Do not rely on deprecated argument signature

This commit fixes the following warning in the puppet master's logs:

Jan 26 16:09:26 <daemon.warn> marvin puppet-master[68168]: The argument signature (String format, [String timezone]) is deprecated for #strfime. See #strftime documentation and Timespan type for more info
Jan 26 16:09:26 <daemon.warn> marvin puppet-master[68168]:    (at /usr/local/etc/puppet/environments/production/modules/apt/manifests/update.pp:17)
---

diff --git a/manifests/update.pp b/manifests/update.pp
index f3871c0..4b05c21 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -14,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 = (Integer(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
@@ -29,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 = (Integer(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