From 9e4f2a441b30195a7d71df501eb7537b4735e19f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 24 Jun 2019 11:59:13 +0200 Subject: [PATCH] Revert "Also upgrade profiles if only the setting version is incorrect" This reverts commit 77d396b9bdbfe52f70548b26adcc18038ff6115d. The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a regular setting version upgrade, this does not need to be run (and breaks importing profiles). Fixes CURA-6592 --- plugins/CuraProfileReader/CuraProfileReader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index de0e97c806..daab73abc2 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -8,7 +8,6 @@ from UM.PluginRegistry import PluginRegistry from UM.Logger import Logger from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make. -from cura.CuraApplication import CuraApplication #To get the current setting version. from cura.ReaderWriters.ProfileReader import ProfileReader import zipfile @@ -68,7 +67,7 @@ class CuraProfileReader(ProfileReader): return [] version = int(parser["general"]["version"]) - if InstanceContainer.Version != version or "metadata" not in parser or "setting_version" not in parser["metadata"] or parser["metadata"]["setting_version"] != str(CuraApplication.SettingVersion): + if InstanceContainer.Version != version: name = parser["general"]["name"] return self._upgradeProfileVersion(serialized, name, version) else: