Merge pull request #7151 from mitchellh/sethvargo/stderr_and_out
Check both stderr and stdout
This commit is contained in:
commit
01e4a34c9b
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue