GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show error when finding duplicated variant names

Browse Source 
Don't add the second variant we encounter then.

Contributes to issue CURA-5045.
This commit is contained in:
Ghostkeeper 2018-03-27 14:23:54 +02:00
parent 727a164722
commit bc0a3e7fe2
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Machines/VariantManager.py
View File

@ -5,6 +5,7 @@ from enum import Enum
from collections import OrderedDict from collections import OrderedDict
from typing import Optional, TYPE_CHECKING from typing import Optional, TYPE_CHECKING
from UM.ConfigurationErrorMessage import ConfigurationErrorMessage
from UM.Logger import Logger from UM.Logger import Logger
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Util import parseBool from UM.Util import parseBool
@ -78,8 +79,8 @@ class VariantManager:
variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type] variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type]
if variant_name in variant_dict: if variant_name in variant_dict:
# ERROR: duplicated variant name. # ERROR: duplicated variant name.
raise RuntimeError("Found duplicated variant name [%s], type [%s] for machine [%s]" % ConfigurationErrorMessage.getInstance().addFaultyContainers(variant_metadata["id"])
(variant_name, variant_type, variant_definition)) continue #Then ignore this variant. This now chooses one of the two variants arbitrarily and deletes the other one! No guarantees!
variant_dict[variant_name] = ContainerNode(metadata = variant_metadata) variant_dict[variant_name] = ContainerNode(metadata = variant_metadata)