Merge remote-tracking branch 'origin/2.1' into 2.1

This commit is contained in:
grossmj
2017-12-21 09:38:28 +01:00
4 changed files with 9 additions and 9 deletions

View File

@ -1144,7 +1144,7 @@ class QemuVM(BaseNode):
yield from self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1],
nio)
except IndexError:
except (IndexError, KeyError):
raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
adapter_number=adapter_number))