Merge branch '2.2' into 3.0

# Conflicts:
#	dev-requirements.txt
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj
2022-03-13 14:50:02 +10:30
10 changed files with 27 additions and 8 deletions

View File

@ -285,7 +285,7 @@ class QemuVM(BaseNode):
for node in self.manager.nodes:
if node != self and getattr(node, variable) == value:
raise QemuError(
f"Sorry a node without the linked base setting enabled can only be used once on your server. {value} is already used by {node.name}"
f"Sorry a node without the linked base setting enabled can only be used once on your server. {value} is already used by {node.name} in project {node.project.name}"
)
setattr(self, "_" + variable, value)
log.info(