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

providers/virtualbox: import progress works on Windows

This commit is contained in:
Mitchell Hashimoto 2014-03-12 20:02:05 -07:00
parent 621369ebba
commit a8fa2d5ffe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ BUG FIXES:
- hosts/linux: Unusual sed delimiter to avoid conflicts. [GH-3167] - hosts/linux: Unusual sed delimiter to avoid conflicts. [GH-3167]
- providers/virtualbox: Make more internal interactions with VBoxManage - providers/virtualbox: Make more internal interactions with VBoxManage
retryable to avoid spurious VirtualBox errors. [GH-2831] retryable to avoid spurious VirtualBox errors. [GH-2831]
- providers/virtualbox: Import progress works again on Windows.
- provisioners/ansible: Request SSH info within the provision method, - provisioners/ansible: Request SSH info within the provision method,
when we know its available. [GH-3111] when we know its available. [GH-3111]
- synced\_folders/rsync: owner/group settings work. [GH-3163] - synced\_folders/rsync: owner/group settings work. [GH-3163]

2
plugins/providers/virtualbox/driver/version_4_3.rb
View File

@ -203,7 +203,7 @@ module VagrantPlugins
output << data output << data
elsif type == :stderr elsif type == :stderr
# Append the data so we can see the full view # Append the data so we can see the full view
total << data total << data.gsub("\r", "")
# Break up the lines. We can't get the progress until we see an "OK" # Break up the lines. We can't get the progress until we see an "OK"
lines = total.split("\n") lines = total.split("\n")