diff options
author | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
commit | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (patch) | |
tree | 1794e812d83facd93b3007c42632c63ddf1eb2fc /lib/puppet/parser/functions/to_bytes.rb | |
parent | 71cb0f4c2c3bf95f62c9f189f5cef155b09a9682 (diff) | |
parent | 5863ab3901368310186790980aea2b0bf7cecb06 (diff) |
Merge branch 'master' into leap
Diffstat (limited to 'lib/puppet/parser/functions/to_bytes.rb')
-rw-r--r-- | lib/puppet/parser/functions/to_bytes.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/to_bytes.rb b/lib/puppet/parser/functions/to_bytes.rb index 8ff73d1..df490ea 100644 --- a/lib/puppet/parser/functions/to_bytes.rb +++ b/lib/puppet/parser/functions/to_bytes.rb @@ -2,6 +2,8 @@ module Puppet::Parser::Functions newfunction(:to_bytes, :type => :rvalue, :doc => <<-EOS Converts the argument into bytes, for example 4 kB becomes 4096. Takes a single string value as an argument. + These conversions reflect a layperson's understanding of + 1 MB = 1024 KB, when in fact 1 MB = 1000 KB, and 1 MiB = 1024 KiB. EOS ) do |arguments| @@ -21,7 +23,8 @@ module Puppet::Parser::Functions when 'M' then return (value*(1<<20)).to_i when 'G' then return (value*(1<<30)).to_i when 'T' then return (value*(1<<40)).to_i - when 'E' then return (value*(1<<50)).to_i + when 'P' then return (value*(1<<50)).to_i + when 'E' then return (value*(1<<60)).to_i else raise Puppet::ParseError, "to_bytes(): Unknown prefix #{prefix}" end end |