haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1213 from dcarley/puppet_newline_output 

Omit empty lines in Puppet provisioner output
This commit is contained in:
Mitchell Hashimoto 2012-11-02 21:28:51 -07:00
parent 44804ce94b fec9410814
commit 13ebf93f24
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -159,7 +159,8 @@ module VagrantPlugins
:manifest => @manifest_file) :manifest => @manifest_file)
env[:machine].communicate.sudo(command) do |type, data| env[:machine].communicate.sudo(command) do |type, data|
env[:ui].info(data.chomp, :prefix => false) data.chomp!
env[:ui].info(data, :prefix => false) if !data.empty?
end end
end end

3
plugins/provisioners/puppet/provisioner/puppet_server.rb
View File

@ -71,7 +71,8 @@ module VagrantPlugins
env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd") env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
env[:vm].channel.sudo(command) do |type, data| env[:vm].channel.sudo(command) do |type, data|
env[:ui].info(data.chomp, :prefix => false) data.chomp!
env[:ui].info(data, :prefix => false) if !data.empty?
end end
end end
end end