From bc0a3e7fe2b1d3d0dfbb9223f14f6257b3f3bdfa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Mar 2018 14:23:54 +0200 Subject: [PATCH] Show error when finding duplicated variant names Don't add the second variant we encounter then. Contributes to issue CURA-5045. --- cura/Machines/VariantManager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 4e033e054e..a1cb638555 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -5,6 +5,7 @@ from enum import Enum from collections import OrderedDict from typing import Optional, TYPE_CHECKING +from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Util import parseBool @@ -78,8 +79,8 @@ class VariantManager: variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type] if variant_name in variant_dict: # ERROR: duplicated variant name. - raise RuntimeError("Found duplicated variant name [%s], type [%s] for machine [%s]" % - (variant_name, variant_type, variant_definition)) + ConfigurationErrorMessage.getInstance().addFaultyContainers(variant_metadata["id"]) + 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)