diff options
| author | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
| commit | 066c08f8362d53f0f30897cb8710d11260c726ea (patch) | |
| tree | a6369eecd88bb731fe413d0bbc8af73d74d1f447 /lib/puppet/parser/functions/time.rb | |
| parent | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff) | |
| parent | b65dd1f45d10e10e45455358aeabb29167990e2c (diff) | |
Merge remote-tracking branch 'origin/master' into leap_master
Diffstat (limited to 'lib/puppet/parser/functions/time.rb')
| -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 |