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

Merge pull request #4341 from databus23/patch-2 

core: selecting for duration of timeout can cause hang
This commit is contained in:
Mitchell Hashimoto 2014-08-29 09:52:33 -07:00
parent b842a3ed62 c72c8dce40
commit 7fe5b70d51
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/util/subprocess.rb
View File

@ -128,7 +128,7 @@ module Vagrant
@logger.debug("Selecting on IO") @logger.debug("Selecting on IO")
while true while true
writers = notify_stdin ? [process.io.stdin] : [] writers = notify_stdin ? [process.io.stdin] : []
results = ::IO.select([stdout, stderr], writers, nil, timeout || 0.1) results = ::IO.select([stdout, stderr], writers, nil, 0.1)
results ||= [] results ||= []
readers = results[0] readers = results[0]
writers = results[1] writers = results[1]