mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
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:
commit
f8a83e7ff9
10 files changed
+27
-8
No files matched your search
@@ -446,6 +446,12 @@ class DockerVM(BaseNode):
|
||||
continue
|
||||
if not e.startswith("GNS3_"):
|
||||
formatted = self._format_env(variables, e)
|
||||
vm_name = self._name.replace(",", ",,")
|
||||
project_path = self.project.path.replace(",", ",,")
|
||||
formatted = formatted.replace("%vm-name%", '"' + vm_name.replace('"', '\\"') + '"')
|
||||
formatted = formatted.replace("%vm-id%", self._id)
|
||||
formatted = formatted.replace("%project-id%", self.project.id)
|
||||
formatted = formatted.replace("%project-path%", '"' + project_path.replace('"', '\\"') + '"')
|
||||
params["Env"].append(formatted)
|
||||
|
||||
if self._console_type == "vnc":
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in new issue
Block a user