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

providers/docker: fix some extranneous newlines in streamed output

This commit is contained in:
Mitchell Hashimoto 2014-04-27 18:26:12 -07:00
parent f1e1617cfd
commit a8822e84d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/providers/docker/action/create.rb
View File

@ -56,7 +56,7 @@ module VagrantPlugins
env[:ui].detail(" \n"+I18n.t("docker_provider.running_detached")) env[:ui].detail(" \n"+I18n.t("docker_provider.running_detached"))
else else
# For run commands, we run it and stream back the output # For run commands, we run it and stream back the output
env[:ui].detail(" \n"+I18n.t("docker_provider.running")) env[:ui].detail(" \n"+I18n.t("docker_provider.running")+"\n ")
@driver.create(params) do |type, data| @driver.create(params) do |type, data|
env[:ui].detail(data) env[:ui].detail(data)
end end

6
plugins/providers/docker/executor/vagrant.rb
View File

@ -20,7 +20,7 @@ module VagrantPlugins
# We have to do this because boot2docker outputs a login shell # We have to do this because boot2docker outputs a login shell
# boot2docker version that we get otherwise and messes up output. # boot2docker version that we get otherwise and messes up output.
start_fence = "========== VAGRANT DOCKER BEGIN ==========" start_fence = "========== VAGRANT DOCKER BEGIN =========="
ssh_cmd = "echo \"#{start_fence}\"; #{cmd}" ssh_cmd = "echo -n \"#{start_fence}\"; #{cmd}"
stderr = "" stderr = ""
stdout = "" stdout = ""
@ -42,8 +42,8 @@ module VagrantPlugins
# We're now fenced, send all the data through # We're now fenced, send all the data through
if block if block
block.call(:stdout, stdout) block.call(:stdout, stdout) if stdout != ""
block.call(:stderr, stderr) block.call(:stderr, stderr) if stderr != ""
end end
end end
else else