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

More robust VBoxManage error checking. [GH-1669]

This commit is contained in:
Mitchell Hashimoto 2013-04-29 10:11:20 -07:00
parent 2cf53df7b6
commit ad5873d330
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,9 @@
## 1.2.3 (unreleased) ## 1.2.3 (unreleased)
IMPROVEMENTS:
- Better VBoxManage error detection on Windows systems. This avoids
some major issues where Vagrant would sometimes "lose" your VM. [GH-1669]
## 1.2.2 (April 23, 2013) ## 1.2.2 (April 23, 2013)

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

@ -303,7 +303,7 @@ module VagrantPlugins
# Sometimes, VBoxManage fails but doesn't actual return a non-zero # Sometimes, VBoxManage fails but doesn't actual return a non-zero
# exit code. For this we inspect the output and determine if an error # exit code. For this we inspect the output and determine if an error
# occurred. # occurred.
if r.stderr =~ /VBoxManage: error:/ if r.stderr =~ /VBoxManage([.a-z]+?): error:/
@logger.info("VBoxManage error text found, assuming error.") @logger.info("VBoxManage error text found, assuming error.")
errored = true errored = true
end end