diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2015-06-04 10:51:41 -0700 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2015-06-04 10:51:41 -0700 |
commit | c69b75f88bba933857c161945721b3802445d9be (patch) | |
tree | 622e7d2792d0ca86c5ce75c898e3605562e12db1 /lib | |
parent | 0dd4f69424787f2af64d8e94bf371810025cb141 (diff) | |
parent | ad4ca4cc3486b0eaaa813595907521ce35c970ce (diff) | |
download | puppet-stdlib-c69b75f88bba933857c161945721b3802445d9be.tar.gz puppet-stdlib-c69b75f88bba933857c161945721b3802445d9be.tar.bz2 |
Merge pull request #469 from hunner/fix_time
Fix time() on 1.8.7
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/parser/functions/time.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/time.rb b/lib/puppet/parser/functions/time.rb index 0cddaf8..c574747 100644 --- a/lib/puppet/parser/functions/time.rb +++ b/lib/puppet/parser/functions/time.rb @@ -33,13 +33,14 @@ Will return something like: 1311972653 ENV['TZ'] = time_zone - time = local_time.localtime + result = local_time.localtime.strftime('%s') ENV['TZ'] = original_zone + else + result = time.localtime.strftime('%s') end # Calling Time#to_i on a receiver changes it. Trust me I am the Doctor. - result = time.strftime('%s') result = result.to_i return result |