Merge pull request #7151 from mitchellh/sethvargo/stderr_and_out

Check both stderr and stdout
This commit is contained in:
Seth Vargo 2016-03-17 10:58:57 -04:00
commit 01e4a34c9b
4 changed files with 8 additions and 4 deletions

View File

@ -129,7 +129,8 @@ module VagrantPlugins
result.sort
rescue Vagrant::Errors::VBoxManageError => e
return [] if e.extra_data[:stderr].include?("does not have")
d = e.extra_data
return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
raise
end

View File

@ -656,7 +656,8 @@ module VagrantPlugins
result.sort
rescue Vagrant::Errors::VBoxManageError => e
return [] if e.extra_data[:stdout].include?("does not have")
d = e.extra_data
return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
raise
end

View File

@ -135,7 +135,8 @@ module VagrantPlugins
result.sort
rescue Vagrant::Errors::VBoxManageError => e
return [] if e.extra_data[:stdout].include?("does not have")
d = e.extra_data
return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
raise
end

View File

@ -131,7 +131,8 @@ module VagrantPlugins
result.sort
rescue Vagrant::Errors::VBoxManageError => e
return [] if e.extra_data[:stdout].include?("does not have")
d = e.extra_data
return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
raise
end