2901dae948
Instead of always joining stdout and stderr, only join the two if the caller explicitly asks for it. Otherwise, only return stdout.
46 lines
1.2 KiB
Ruby
46 lines
1.2 KiB
Ruby
require "vagrant/util/busy"
|
|
require "vagrant/util/subprocess"
|
|
|
|
module VagrantPlugins
|
|
module DockerProvider
|
|
module Executor
|
|
# The Local executor executes a Docker client that is running
|
|
# locally.
|
|
class Local
|
|
def execute(*cmd, **opts, &block)
|
|
# Append in the options for subprocess
|
|
cmd << { notify: [:stdout, :stderr] }
|
|
|
|
interrupted = false
|
|
int_callback = ->{ interrupted = true }
|
|
result = ::Vagrant::Util::Busy.busy(int_callback) do
|
|
::Vagrant::Util::Subprocess.execute(*cmd, &block)
|
|
end
|
|
|
|
result.stderr.gsub!("\r\n", "\n")
|
|
result.stdout.gsub!("\r\n", "\n")
|
|
|
|
if result.exit_code != 0 && !interrupted
|
|
raise Errors::ExecuteError,
|
|
command: cmd.inspect,
|
|
stderr: result.stderr,
|
|
stdout: result.stdout
|
|
end
|
|
|
|
if opts
|
|
if opts[:with_stderr]
|
|
return result.stdout + " " + result.stderr
|
|
else
|
|
return result.stdout
|
|
end
|
|
end
|
|
end
|
|
|
|
def windows?
|
|
::Vagrant::Util::Platform.windows? || ::Vagrant::Util::Platform.wsl?
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|