Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2019-06-24 12:59:13 +0300
committerJaime van Kessel <nallath@gmail.com>2019-06-24 12:59:13 +0300
commit9e4f2a441b30195a7d71df501eb7537b4735e19f (patch)
tree73337ae234b840580bbe6ab964120ffb6641f742 /plugins/CuraProfileReader
parent0a0b4821efe6702f16e0327bf39039f1b162c2e9 (diff)
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
Diffstat (limited to 'plugins/CuraProfileReader')
-rw-r--r--plugins/CuraProfileReader/CuraProfileReader.py3
1 files changed, 1 insertions, 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: