From 1273be2630a268da785a7b4590707f82309f6bbc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 8 Jun 2022 10:45:43 +0200 Subject: [PATCH 1/2] Don't allow containers without type and name in container registry If the name was missing it would cause Cura to crash. If the type was missing it wouldn't crash, but it would silently fail to load the model which is also not good. With this change, in both cases it will add a warning to the log. Contributes to issue CURA-3Z4. --- UM/Settings/ContainerRegistry.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/UM/Settings/ContainerRegistry.py b/UM/Settings/ContainerRegistry.py index 6067b7ee38..8af3c19aef 100644 --- a/UM/Settings/ContainerRegistry.py +++ b/UM/Settings/ContainerRegistry.py @@ -843,13 +843,11 @@ def _onContainerMetaDataChanged(self, *args: ContainerInterface, **kwargs: Any) def _isMetadataValid(self, metadata: Optional[metadata_type]) -> bool: """Validate a metadata object. - If the metadata is invalid, the container is not allowed to be in the - registry. + If the metadata is invalid, the container is not allowed to be in the registry. :param metadata: A metadata object. :return: Whether this metadata was valid. """ - - return metadata is not None + return metadata is not None and "type" in metadata and "name" in metadata def getLockFilename(self) -> str: """Get the lock filename including full path From c85203fb4a9ef358970526530ddb6786add268a0 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 10 Oct 2023 10:55:49 +0200 Subject: [PATCH 2/2] set version to 5.6.0-alpha --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 617d2c3bdb..1c7a69a3e3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -34,7 +34,7 @@ class UraniumConan(ConanFile): def set_version(self): if not self.version: - self.version = "5.5.0-beta.2" + self.version = "5.6.0-alpha" @property def _base_dir(self):