From: mh Date: Wed, 4 Dec 2013 21:54:44 +0000 (+0100) Subject: fix deprecation warning 'Puppet::Util.execute is deprecated; please use Puppet::Util... X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6578e0c9188fd41a9c9e066dbd984b79bb8961a3;p=puppet-sshd.git fix deprecation warning 'Puppet::Util.execute is deprecated; please use Puppet::Util::Execution.execute' --- diff --git a/lib/puppet/parser/functions/ssh_keygen.rb b/lib/puppet/parser/functions/ssh_keygen.rb index 597315e..d411a28 100644 --- a/lib/puppet/parser/functions/ssh_keygen.rb +++ b/lib/puppet/parser/functions/ssh_keygen.rb @@ -19,7 +19,9 @@ Puppet::Parser::Functions::newfunction(:ssh_keygen, :type => :rvalue, :doc => FileUtils.mkdir_p(dir, :mode => 0700) end unless [private_key_path,public_key_path].all?{|path| File.exists?(path) } - output = Puppet::Util.execute(['/usr/bin/ssh-keygen','-t', 'rsa', '-b', '4096', '-f', private_key_path, '-P', '', '-q']) + output = Puppet::Util::Execution.execute( + ['/usr/bin/ssh-keygen','-t', 'rsa', '-b', '4096', + '-f', private_key_path, '-P', '\'\'', '-q']) raise Puppet::ParseError, "Something went wrong during key generation! Output: #{output}" unless output.empty? end [File.read(private_key_path),File.read(public_key_path)]