vagrantup 0.9.6 → 0.9.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/vagrant/util/subprocess.rb +14 -5
- data/lib/vagrant/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b1d7e8f9a0b6d47c68c8cfb4192bd3afa8d9d2ce
|
4
|
+
data.tar.gz: a8865e244a54fc4dcd14b54a27c87ad0740df019
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1bbd300b908863fc8a714108f1e9d11a29cbde5d9cd0ffe2be1b8e669fde5222fde1a35b05ba412ce7b3627aa3f979fcd31b1fa5b9b8a200705a1599886562cb
|
7
|
+
data.tar.gz: 7c2c4860f428ffecca43814ff4929a6b2019cc89eba5fc6b4f14da7025513ba81af1a83c00fe80a332d491fea287ffe3575970ec7ab29bbe5a361ca38779de60
|
data/CHANGELOG.md
CHANGED
@@ -64,6 +64,14 @@ module Vagrant
|
|
64
64
|
# Make sure the stdin does not buffer
|
65
65
|
process.io.stdin.sync = true
|
66
66
|
|
67
|
+
if RUBY_PLATFORM != "java"
|
68
|
+
# On Java, we have to close after. See down the method...
|
69
|
+
# Otherwise, we close the writers right here, since we're
|
70
|
+
# not on the writing side.
|
71
|
+
stdout_writer.close
|
72
|
+
stderr_writer.close
|
73
|
+
end
|
74
|
+
|
67
75
|
# Create a dictionary to store all the output we see.
|
68
76
|
io_data = { :stdout => "", :stderr => "" }
|
69
77
|
|
@@ -136,11 +144,12 @@ module Vagrant
|
|
136
144
|
yield io_name, extra_data if block_given?
|
137
145
|
end
|
138
146
|
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
147
|
+
if RUBY_PLATFORM == "java"
|
148
|
+
# On JRuby, we need to close the writers after the process,
|
149
|
+
# for some reason. See GH-711.
|
150
|
+
stdout_writer.close
|
151
|
+
stderr_writer.close
|
152
|
+
end
|
144
153
|
|
145
154
|
# Return an exit status container
|
146
155
|
return Result.new(process.exit_code, io_data[:stdout], io_data[:stderr])
|
data/lib/vagrant/version.rb
CHANGED