projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
puppet 4 foo
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
lib
/
puppet
/
parser
/
functions
/
hkdf.rb
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/hkdf.rb
b/modules/puppetmaster/lib/puppet/parser/functions/hkdf.rb
index
5453ef3
..
7f60b3d
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/hkdf.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/hkdf.rb
@@
-77,7
+77,7
@@
module Puppet::Parser::Functions
begin
secret = File.new(secretfile, "r").read
rescue => e
begin
secret = File.new(secretfile, "r").read
rescue => e
- raise Puppet::ParseError, "Error loading secret from #{sec
c
retfile}: #{e.message}\n#{e.backtrace}"
+ raise Puppet::ParseError, "Error loading secret from #{secretfile}: #{e.message}\n#{e.backtrace}"
end
hkdf = HKDF.new(secret, :info => data)
end
hkdf = HKDF.new(secret, :info => data)