Merge pull request #608 from mhaskel/MODULES-1923

MODULES-1923 - Use the correct command with Puppet < 3.4
This commit is contained in:
Bryan Jen 2015-04-13 12:02:00 -07:00
commit 89a781fe39

View file

@ -51,8 +51,7 @@ Puppet::Type.type(:postgresql_psql).provide(:ruby) do
command = command.join ' ' command = command.join ' '
environment = get_environment environment = get_environment
if Puppet::PUPPETVERSION.to_f < 3.4 if Puppet::PUPPETVERSION.to_f < 3.4
require 'puppet/util/execution' Puppet::Util.withenv environment do
Puppet::Util::Execution.withenv environment do
Puppet::Util::SUIDManager.run_and_capture(command, user, group) Puppet::Util::SUIDManager.run_and_capture(command, user, group)
end end
else else