diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-04-13 15:04:46 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-04-13 15:04:46 -0700 |
| commit | 008770dba7946b67f252561fecd967c7fe67fd17 (patch) | |
| tree | 24be11a1aa3b7e8d2cce066b8c106dfc1e10443a /lib/puppet/parser | |
| parent | 175803b7d27d7ab1be758dd779ca1568e429d096 (diff) | |
| parent | 4ef622e0874c53c8060531d43da06f0fd6fddc36 (diff) | |
| download | puppet-008770dba7946b67f252561fecd967c7fe67fd17.tar.gz puppet-008770dba7946b67f252561fecd967c7fe67fd17.tar.xz puppet-008770dba7946b67f252561fecd967c7fe67fd17.zip | |
Merge branch 'ticket/next/6830-more_ruby19_fixes' into next
* ticket/next/6830-more_ruby19_fixes:
(#6830) Fix sha1 to digest/sha1 require issue for Ruby 1.9
(#6830) Fix UTF-8 encoding issue for Ruby 1.9
(#6830) Fix string method sub call on a symbol for Ruby 1.9
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/functions/sha1.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/sha1.rb b/lib/puppet/parser/functions/sha1.rb index 10cc55cfe..1e7d5abe4 100644 --- a/lib/puppet/parser/functions/sha1.rb +++ b/lib/puppet/parser/functions/sha1.rb @@ -1,5 +1,5 @@ Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc => "Returns a SHA1 hash value from a provided string.") do |args| - require 'sha1' + require 'digest/sha1' Digest::SHA1.hexdigest(args[0]) end |