plugins/providers/docker/executor/local.rb in vagrant-unbundled-2.2.6.2 vs plugins/providers/docker/executor/local.rb in vagrant-unbundled-2.2.7.0
- old
+ new
@@ -25,10 +25,16 @@
command: cmd.inspect,
stderr: result.stderr,
stdout: result.stdout
end
- result.stdout
+ 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