Commit cba26589 authored by anonym's avatar anonym
Browse files

Be more careful when identifying unupgradable devices.

Now we also accept if the error is shown but for *other* devices than
the target device.
parent 76becb81
...@@ -78,7 +78,10 @@ end ...@@ -78,7 +78,10 @@ end
def usb_install_helper(name) def usb_install_helper(name)
@screen.wait('USBTailsLogo.png', 10) @screen.wait('USBTailsLogo.png', 10)
if @screen.exists("USBCannotUpgrade.png") text = Dogtail::Application.new('tails-installer')
.child('', roleName: 'text').text
dev = $vm.disk_dev(name)
if text.match(/It is impossible to upgrade the device .+ #{dev}\d* /)
raise UpgradeNotSupported raise UpgradeNotSupported
end end
begin begin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment