Check both stderr and stdout
Different vbox versions print this to different streams, so check both just to be sure
This commit is contained in:
parent
32c4638ffd
commit
d565c2f07e
|
@ -129,7 +129,8 @@ module VagrantPlugins
|
||||||
|
|
||||||
result.sort
|
result.sort
|
||||||
rescue Vagrant::Errors::VBoxManageError => e
|
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
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -656,7 +656,8 @@ module VagrantPlugins
|
||||||
|
|
||||||
result.sort
|
result.sort
|
||||||
rescue Vagrant::Errors::VBoxManageError => e
|
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
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,8 @@ module VagrantPlugins
|
||||||
|
|
||||||
result.sort
|
result.sort
|
||||||
rescue Vagrant::Errors::VBoxManageError => e
|
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
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,8 @@ module VagrantPlugins
|
||||||
|
|
||||||
result.sort
|
result.sort
|
||||||
rescue Vagrant::Errors::VBoxManageError => e
|
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
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue